Merge pull request #2704 from HenrikJannsen/Avoid-that-textfields-get…

…-selected-at-screen-change Process onInputTextFieldFocus only if editable
bisq-network · Aug 27, 2024 · ab9f551 · ab9f551
2 parents 140c9ae + 85bdad0
commit ab9f551
Showing 1 changed file with 22 additions and 17 deletions.
diff --git a/apps/desktop/desktop/src/main/java/bisq/desktop/components/controls/MaterialTextField.java b/apps/desktop/desktop/src/main/java/bisq/desktop/components/controls/MaterialTextField.java
@@ -83,7 +83,10 @@ public MaterialTextField(@Nullable String description, @Nullable String prompt,
         this(description, prompt, help, null);
     }
 
-    public MaterialTextField(@Nullable String description, @Nullable String prompt, @Nullable String help, @Nullable String value) {
+    public MaterialTextField(@Nullable String description,
+                             @Nullable String prompt,
+                             @Nullable String help,
+                             @Nullable String value) {
         bg.getStyleClass().add("material-text-field-bg");
 
         line.setPrefHeight(1);
@@ -400,23 +403,25 @@ protected void onMouseExited() {
     }
 
     protected void onInputTextFieldFocus(boolean focus) {
-        if (focus && textInputControl.isEditable()) {
-            resetValidation();
-            selectionLine.setPrefWidth(0);
-            selectionLine.setOpacity(1);
-            Transitions.animateWidth(selectionLine, getWidth());
-        } else {
-            Transitions.fadeOut(selectionLine, 200);
-            stringConverter.ifPresent(stringConverter -> {
-                try {
-                    setText(stringConverter.toString(stringConverter.fromString(getText())));
-                } catch (Exception ignore) {
-                }
-            });
-            validate();
+        if (textInputControl.isEditable()) {
+            if (focus) {
+                resetValidation();
+                selectionLine.setPrefWidth(0);
+                selectionLine.setOpacity(1);
+                Transitions.animateWidth(selectionLine, getWidth());
+            } else {
+                Transitions.fadeOut(selectionLine, 200);
+                stringConverter.ifPresent(stringConverter -> {
+                    try {
+                        setText(stringConverter.toString(stringConverter.fromString(getText())));
+                    } catch (Exception ignore) {
+                    }
+                });
+                validate();
+            }
+            onMouseExited();
+            update();
         }
-        onMouseExited();
-        update();
     }
 
     protected void onWidthChanged(double width) {