Changeset 4615 in josm for trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

Timestamp:

2011-11-27T15:58:09+01:00 (12 years ago)

Author:

jttt

Message:

Use different way to center popup menu title to prevent blank menu on Windows 7, add shortcuts to enable/hiding of filters (see #5515)

File:

• trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/tools/MultikeyActionsHandler.java

@@ -15 +15 @@
 import javax.swing.Action;
 import javax.swing.JMenuItem;
+import javax.swing.JPanel;
 import javax.swing.JPopupMenu;
 import javax.swing.KeyStroke;
+import javax.swing.event.PopupMenuEvent;
+import javax.swing.event.PopupMenuListener;
 
 import org.openstreetmap.josm.Main;
@@ -131 +134 @@
 
         JMenuItem lbTitle = new JMenuItem((String) action.action.getValue(Action.SHORT_DESCRIPTION));
-        lbTitle.setHorizontalAlignment(JMenuItem.CENTER);
         lbTitle.setEnabled(false);
-        layers.add(lbTitle);
+        JPanel pnTitle = new JPanel();
+        pnTitle.add(lbTitle);
+        layers.add(pnTitle);
 
         char repeatKey = (char) action.shortcut.getKeyCode();
@@ -150 +154 @@
                 @Override
                 public void actionPerformed(ActionEvent e) {
-                    Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
                     action.action.executeMultikeyAction(info.getIndex(), false);
                 }
@@ -167 +170 @@
                     @Override
                     public void actionPerformed(ActionEvent e) {
-                        Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
                         action.action.executeMultikeyAction(-1, true);
                     }
@@ -174 +176 @@
             }
         }
+        layers.addPopupMenuListener(new PopupMenuListener() {
+
+            @Override
+            public void popupMenuWillBecomeVisible(PopupMenuEvent e) {}
+
+            @Override
+            public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {
+                Main.map.statusLine.resetHelpText(STATUS_BAR_ID);
+            }
+
+            @Override
+            public void popupMenuCanceled(PopupMenuEvent e) {}
+        });
 
         layers.show(Main.parent, Integer.MAX_VALUE, Integer.MAX_VALUE);