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

Timestamp:

2017-11-19T23:26:00+01:00 (6 years ago)

Author:

Don-vip

Message:

fix #15568 - properly highlight menu items search results

File:

• trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java (modified) (3 diffs)

trunk/src/org/openstreetmap/josm/gui/dialogs/MenuItemSearchDialog.java

@@ -27 +27 @@
 public final class MenuItemSearchDialog extends ExtendedDialog {
 
-    private final Selector selector;
+    private final MenuItemSelector selector;
     private static final MenuItemSearchDialog INSTANCE = new MenuItemSearchDialog(MainApplication.getMenu());
 
     private MenuItemSearchDialog(MainMenu menu) {
         super(Main.parent, tr("Search menu items"), tr("Select"), tr("Cancel"));
-        this.selector = new Selector(menu);
+        this.selector = new MenuItemSelector(menu);
         this.selector.setDblClickListener(e -> buttonAction(0, null));
         setContent(selector, false);
@@ -63 +63 @@
     }
 
-    private static class Selector extends SearchTextResultListPanel<JMenuItem> {
+    private static class MenuItemSelector extends SearchTextResultListPanel<JMenuItem> {
 
         private final MainMenu menu;
 
-        Selector(MainMenu menu) {
+        MenuItemSelector(MainMenu menu) {
             super();
             this.menu = menu;
@@ -103 +103 @@
                     .map(Shortcut::getKeyStroke)
                     .ifPresent(item::setAccelerator);
+            item.setArmed(isSelected);
             if (isSelected) {
                 item.setBackground(list.getSelectionBackground());