From 972c92c6fc87b1b4ff8afa9d2b9533f3c68d2ca2 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Sat, 22 Apr 2017 23:13:31 +0200
Subject: [PATCH] Closed #80 - datapicker weird behaviour
---
.../budgetmaster/ui/NewPaymentController.java | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
index 51355b5c2..ed8398a8b 100644
--- a/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
+++ b/src/de/deadlocker8/budgetmaster/ui/NewPaymentController.java
@@ -17,7 +17,6 @@ import de.deadlocker8.budgetmaster.ui.cells.RepeatingDayCell;
import de.deadlocker8.budgetmaster.ui.cells.SmallCategoryCell;
import fontAwesome.FontIcon;
import fontAwesome.FontIconType;
-import javafx.application.Platform;
import javafx.fxml.FXML;
import javafx.scene.control.Alert.AlertType;
import javafx.scene.control.Button;
@@ -213,9 +212,18 @@ public class NewPaymentController
toggleRepeatingArea(false);
//preselect correct month and year
- DateTime currentDate = controller.getCurrentDate();
- datePicker.setValue(LocalDate.now().withYear(currentDate.getYear()).withMonth(currentDate.getMonthOfYear()).withDayOfMonth(currentDate.getDayOfMonth()));
- Platform.runLater(()->{datePicker.getEditor().clear();});
+ DateTime currentDate = controller.getCurrentDate();
+ if(DateTime.now().getDayOfMonth() > currentDate.dayOfMonth().withMaximumValue().getDayOfMonth())
+ {
+ currentDate = currentDate.dayOfMonth().withMaximumValue();
+ }
+
+ LocalDate currentLocalDate = LocalDate.now().withYear(currentDate.getYear())
+ .withMonth(currentDate.getMonthOfYear())
+ .withDayOfMonth(currentDate.getDayOfMonth());
+ datePicker.setValue(currentLocalDate);
+ datePicker.setEditable(false);
+ //Platform.runLater(()->{datePicker.getEditor().clear();});
}
}
--
GitLab