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

Timestamp:

2009-11-28T07:38:50+01:00 (14 years ago)

Author:

bastiK

Message:

fix #4030 - Hide/minimize icon in right menus not working properly

Location:

trunk/src/org/openstreetmap/josm/gui/dialogs

Files:

• DialogsPanel.java (modified) (1 diff)
• ToggleDialog.java (modified) (8 diffs)

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

@@ -67 +67 @@
                 dlg.showDialog();
                 if (dlg.isDialogInCollapsedView()) {
+                    dlg.isCollapsed = false;    // pretend to be in Default view, this will be set back by collapse()
                     dlg.collapse();
                 }

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

@@ -66 +66 @@
      * currently minimized or not.
      */
-    private boolean isCollapsed;
+    boolean isCollapsed;
 
     /** the preferred height if the toggle dialog is expanded */
@@ -119 +119 @@
         isDocked = Main.pref.getBoolean(preferencePrefix+".docked", true);
         isCollapsed = Main.pref.getBoolean(preferencePrefix+".minimized", false);
+        //System.err.println(name+": showing="+isShowing+" docked="+isDocked+" collapsed="+isCollapsed);
     }
 
@@ -142 +143 @@
             } else {
                 showDialog();
-                expand();
-                dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                if (isDocked && isCollapsed) {
+                    expand();
+                }
+                if (isDocked) {
+                    dialogsPanel.reconstruct(Action.INVISIBLE_TO_DEFAULT, ToggleDialog.this);
+                }
             }
         }
@@ -206 +211 @@
      */
     public void collapse() {
-        if (isShowing && isDocked && !isCollapsed) {
+//        if (isShowing && isDocked && !isCollapsed) {
             setContentVisible(false);
             setIsCollapsed(true);
@@ -214 +219 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
             hideNotify();
-        }
+//        }
+//        else throw ...
     }
 
@@ -221 +227 @@
      */
     protected void expand() {
-        if (isShowing && isDocked && isCollapsed) {
+//        if (isShowing && isDocked && isCollapsed) {
             setContentVisible(true);
             setIsCollapsed(false);
@@ -228 +234 @@
             lblMinimized.setIcon(ImageProvider.get("misc", "normal"));
             showNotify();
-        }
+//        }
+//        else throw ...
     }
 
@@ -318 +325 @@
                         @Override
                         public void mouseClicked(MouseEvent e) {
-                            //                            toggleExpandedState();
+                            // toggleExpandedState();
                             if (isCollapsed) {
                                 expand();