Changeset 4127 in josm

Timestamp:

Jun 7, 2011 11:29:54 PM (2 years ago)

Author:

bastiK

Message:

fixed #6443 - Disabled toggle buttons should not occupy space

File:

• trunk/src/org/openstreetmap/josm/gui/MapFrame.java (modified) (5 diffs)

trunk/src/org/openstreetmap/josm/gui/MapFrame.java

@@ -258 +258 @@
     public IconToggleButton addToggleDialog(final ToggleDialog dlg) {
         final IconToggleButton button = new IconToggleButton(dlg.getToggleAction());
-        toolBarToggle.add(button);
         button.addMouseListener(new PopupMenuLauncher(new JPopupMenu() {
             {
@@ -270 +269 @@
                     public void actionPerformed(ActionEvent e) {
                         dlg.hideButton();
+                        validateToolBarToggle();
                     }
                 });
@@ -275 +275 @@
         }));
         dlg.setButton(button);
+        if (button.isVisible()) {
+            toolBarToggle.add(button);
+        }
         allDialogs.add(dlg);
         if (dialogsPanel.initialized) {
@@ -280 +283 @@
         }
         return button;
+    }
+    
+    public void validateToolBarToggle() {
+        toolBarToggle.removeAll();
+        for (ToggleDialog dlg : allDialogs) {
+            if (dlg.getButton().isVisible()) {
+                toolBarToggle.add(dlg.getButton());
+            }
+        }
     }
 
@@ -381 +393 @@
                         if ((Boolean) getValue(SELECTED_KEY)) {
                             t.showButton();
+                            validateToolBarToggle();
                         } else {
                             t.hideButton();
+                            validateToolBarToggle();
                         }
                     }