Changeset 13139 in josm for trunk/src/org/openstreetmap

Timestamp:

2017-11-20T23:50:18+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #13747 - do not select all characters from a combobox when switching between JOSM and another application

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• dialogs/properties/TagEditHelper.java (modified) (1 diff)
• tagging/ac/AutoCompletingComboBox.java (modified) (1 diff)

trunk/src/org/openstreetmap/josm/gui/dialogs/properties/TagEditHelper.java

@@ -635 +635 @@
                @Override
                public void focusGained(FocusEvent e) {
+                   Logging.trace("Focus gained by {0}, e={1}", values, e);
                    String key = keys.getEditor().getItem().toString();
-
-                   List<AutoCompletionItem> valueList = autocomplete.getTagValues(getAutocompletionKeys(key), comparator);
-                   Logging.trace("Focus gained by {0}, e={1}", values, e);
-                   values.setPossibleAcItems(valueList);
-                   values.getEditor().selectAll();
-                   objKey = key;
+                   if (!Objects.equals(key, objKey)) {
+                       values.setPossibleAcItems(autocomplete.getTagValues(getAutocompletionKeys(key), comparator));
+                       values.getEditor().selectAll();
+                       objKey = key;
+                   }
                }
            };

trunk/src/org/openstreetmap/josm/gui/tagging/ac/AutoCompletingComboBox.java

@@ -76 +76 @@
                     sysSel.setContents(old, null);
                 }
-            } else {
+            } else if (e != null && e.getOppositeComponent() != null) {
+                // Select all characters when the change of focus occurs inside JOSM only.
+                // When switching from another application, it is annoying, see #13747
                 editorComponent.selectAll();
             }