Fix missing focus on DurationPicker, TimePicker, YearMonthPicker, Yea…

…rPicker
dlsc-software-consulting-gmbh · Feb 23, 2024 · 5fb9c92 · 5fb9c92
1 parent 556516d
commit 5fb9c92
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 5 deletions.
diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/skins/DurationPickerSkin.java b/gemsfx/src/main/java/com/dlsc/gemsfx/skins/DurationPickerSkin.java
@@ -30,7 +30,10 @@ public DurationPickerSkin(DurationPicker picker) {
 
         Button editButton = new Button();
         editButton.getStyleClass().add("edit-button");
-        editButton.setOnAction(evt -> picker.getOnShowPopup().accept(picker));
+        editButton.setOnAction(evt -> {
+            picker.requestFocus();
+            picker.getOnShowPopup().accept(picker);
+        });
         editButton.setMaxHeight(Double.MAX_VALUE);
         editButton.setGraphic(new FontIcon());
         editButton.setFocusTraversable(false);

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/skins/TimePickerSkin.java b/gemsfx/src/main/java/com/dlsc/gemsfx/skins/TimePickerSkin.java
@@ -50,7 +50,10 @@ public TimePickerSkin(TimePicker picker) {
         millisecondField.setPreviousField(secondField);
 
         editButton.getStyleClass().add("edit-button");
-        editButton.setOnAction(evt -> picker.getOnShowPopup().accept(picker));
+        editButton.setOnAction(evt -> {
+            picker.requestFocus();
+            picker.getOnShowPopup().accept(picker);
+        });
         editButton.setMaxHeight(Double.MAX_VALUE);
         editButton.setGraphic(new FontIcon());
         editButton.setFocusTraversable(false);

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/skins/YearMonthPickerSkin.java b/gemsfx/src/main/java/com/dlsc/gemsfx/skins/YearMonthPickerSkin.java
@@ -25,8 +25,10 @@ public YearMonthPickerSkin(YearMonthPicker picker) {
         editButton.setFocusTraversable(false);
         editButton.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
         editButton.getStyleClass().add("edit-button"); // using styles similar to combobox, for consistency
-        editButton.setOnMouseClicked(evt -> picker.show());
-
+        editButton.setOnMouseClicked(evt -> {
+            picker.requestFocus();
+            picker.show();
+        });
         HBox.setHgrow(picker.getEditor(), Priority.ALWAYS);
 
         HBox box = new HBox(picker.getEditor(), editButton);

diff --git a/gemsfx/src/main/java/com/dlsc/gemsfx/skins/YearPickerSkin.java b/gemsfx/src/main/java/com/dlsc/gemsfx/skins/YearPickerSkin.java
@@ -25,7 +25,10 @@ public YearPickerSkin(YearPicker picker) {
         editButton.setFocusTraversable(false);
         editButton.setMinSize(Region.USE_PREF_SIZE, Region.USE_PREF_SIZE);
         editButton.getStyleClass().add("edit-button"); // using styles similar to combobox, for consistency
-        editButton.setOnMouseClicked(evt -> picker.show());
+        editButton.setOnMouseClicked(evt -> {
+            picker.requestFocus();
+            picker.show();
+        });
 
         HBox.setHgrow(picker.getEditor(), Priority.ALWAYS);