Replace JFXDatePicker with DatePicker

haveno-dex · Jan 13, 2024 · 669284d · 669284d
1 parent 5c28428
commit 669284d
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java b/desktop/src/main/java/haveno/desktop/main/account/content/seedwords/SeedWordsView.java
@@ -106,6 +106,8 @@ protected void initialize() {
         displaySeedWordsTextArea.setEditable(false);
 
         datePicker = addTopLabelDatePicker(root, ++gridRow, Res.get("seed.date"), 10).second;
+        //note: on MacOS this datePicker does not actually list a date...is it
+        //supposed to?
         datePicker.setMouseTransparent(true);
 
         addTitledGroupBg(root, ++gridRow, 3, Res.get("seed.restore.title"), Layout.GROUP_DISTANCE);

diff --git a/desktop/src/main/java/haveno/desktop/util/FormBuilder.java b/desktop/src/main/java/haveno/desktop/util/FormBuilder.java
@@ -669,7 +669,13 @@ public static Tuple2<Label, DatePicker> addTopLabelDatePicker(GridPane gridPane,
                                                                   int columnIndex,
                                                                   String title,
                                                                   double top) {
-        DatePicker datePicker = new JFXDatePicker();
+        //DatePicker datePicker = new JFXDatePicker();
+        //
+        //Temporary solution to fix issue 527; a more
+        //permanant solution would require this issue to be solved: 
+        //(https://github.com/sshahine/JFoenix/issues/1245)
+        DatePicker datePicker = new DatePicker();
+
         Tuple2<Label, VBox> topLabelWithVBox = addTopLabelWithVBox(gridPane, rowIndex, columnIndex, title, datePicker, top);
         return new Tuple2<>(topLabelWithVBox.first, datePicker);
     }