Changeset 2021 in josm for trunk/src/org

Timestamp:

2009-08-31T12:33:32+02:00 (15 years ago)

Author:

Gubaer

Message:

Improved handling of toggle dialogs

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (2 diffs)
• dialogs/ToggleDialog.java (modified) (10 diffs)

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

@@ -164 +164 @@
      */
     public void setVisibleDialogs() {
-        for (Component c : toggleDialogs.getComponents()) {
-            if (c instanceof ToggleDialog) {
-                ToggleDialog td = (ToggleDialog)c;
-                if (Main.pref.getBoolean(td.getPreferencePrefix()+".visible")) {
-                    td.showDialog();
-                }
+        toggleDialogs.removeAll();
+        for (ToggleDialog dialog: allDialogs) {
+            dialog.setVisible(false);
+            toggleDialogs.add(dialog);
+            dialog.setParent(toggleDialogs);
+            if (Main.pref.getBoolean(dialog.getPreferencePrefix()+".visible")) {
+                dialog.showDialog();
+            } else {
+                dialog.hideDialog();
             }
         }
@@ -180 +183 @@
     public IconToggleButton addToggleDialog(ToggleDialog dlg) {
         IconToggleButton button = new IconToggleButton(dlg.getToggleAction());
-        dlg.setParent(toggleDialogs);
         toolBarToggle.add(button);
-        toggleDialogs.add(dlg);
         allDialogs.add(dlg);
         return button;

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

@@ -6 +6 @@
 import java.awt.Component;
 import java.awt.Dimension;
-import java.awt.EventQueue;
 import java.awt.GridBagLayout;
 import java.awt.Image;
@@ -152 +151 @@
 
         docked = Main.pref.getBoolean(preferencePrefix+".docked", true);
-        if (!docked) {
-            EventQueue.invokeLater(new Runnable(){
-                public void run() {
-                    detach();
-                }
-            });
-        }
         collapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false);
-        if (collapsed) {
-            EventQueue.invokeLater(new Runnable(){
-                public void run() {
-                    collapse();
-                }
-            });
-        }
     }
 
@@ -203 +188 @@
      */
     protected int getDialogPosition() {
+        if (parent == null) return -1;
         for (int i=0; i< parent.getComponentCount(); i++) {
             String name = parent.getComponent(i).getName();
@@ -218 +204 @@
     protected void dock() {
         detachedDialog = null;
+        if (parent == null) return;
 
         // check whether the toggle dialog view contains a placeholder
@@ -225 +212 @@
         if (idx > -1) {
             parent.remove(idx);
-            parent.add(ToggleDialog.this,idx);
+            if (idx >= parent.getComponentCount()) {
+                parent.add(ToggleDialog.this);
+            } else {
+                parent.add(ToggleDialog.this,idx);
+            }
         } else {
             parent.add(ToggleDialog.this);
         }
+        parent.validate();
 
         if(Main.pref.getBoolean(preferencePrefix+".visible")) {
@@ -281 +273 @@
      */
     public void hideDialog() {
-        if (!isShowing) return;
         if (detachedDialog != null) {
             detachedDialog.setVisible(false);
@@ -289 +280 @@
         setVisible(false);
         isShowing = false;
+        Main.pref.put(preferencePrefix+".visible", false);
         refreshToggleDialogsView();
         toggleAction.putValue("selected", false);
@@ -304 +296 @@
      */
     public void showDialog() {
-        if (isShowing) return;
         if (!docked) {
             detach();
-        } else if (!collapsed) {
-            expand();
-            setVisible(true);
-            refreshToggleDialogsView();
         } else {
-            setVisible(true);
-            refreshToggleDialogsView();
+            dock();
+            if (!collapsed) {
+                expand();
+                setVisible(true);
+                refreshToggleDialogsView();
+            } else {
+                setVisible(true);
+                refreshToggleDialogsView();
+            }
         }
         isShowing = true;
+        // toggling the selected value in order to enforce PropertyChangeEvents
+        //
+        toggleAction.putValue("selected", false);
         toggleAction.putValue("selected", true);
+        Main.pref.put(preferencePrefix+".visible", true);
     }
 
@@ -349 +347 @@
         if (detachedDialog != null) {
             detachedDialog.setVisible(false);
+            detachedDialog.removeAll();
+            detachedDialog.dispose();
         }
     }
@@ -494 +494 @@
             } else {
                 pack();
+
             }
             setTitle(titleBar.getTitle());