Changeset 5970 in josm for trunk/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java

Timestamp:

2013-05-28T13:46:20+02:00 (11 years ago)

Author:

Don-vip

Message:

fix broken popup menus in toggle dialog title bars (broken by r5958)

File:

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

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

@@ -478 +478 @@
             add(lblTitle_weak, GBC.std().fill(GBC.HORIZONTAL));
 
-            addMouseListener(new MouseEventHandler());
-
             if(Main.pref.getBoolean("dialog.dynamic.buttons", true)) {
                 buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHiddingType.ALWAYS_SHOWN ? "buttonhide" : "buttonshow"));
@@ -590 +588 @@
         }
         
+        public void registerMouseListener() {
+            addMouseListener(new MouseEventHandler());
+        }
+        
         class MouseEventHandler extends PopupMenuLauncher {
             public MouseEventHandler() {
@@ -860 +862 @@
             buttonsHide.setVisible(false);
         }
+        
+        // Register title bar mouse listener only after buttonActions has been initialized to have a complete popup menu
+        titleBar.registerMouseListener();
+        
         return data;
     }