Changeset 2269 in josm

Timestamp:

2009-10-10T20:35:13+02:00 (15 years ago)

Author:

stoecker

Message:

fix #3674 - patch by bastiK - empty dialogs area did not vanish

Location:

trunk/src/org/openstreetmap/josm/gui

Files:

• MapFrame.java (modified) (2 diffs)
• dialogs/DialogsPanel.java (modified) (3 diffs)

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

@@ -78 +78 @@
      */
     private List<ToggleDialog> allDialogs = new ArrayList<ToggleDialog>();
-    private DialogsPanel dialogsPanel = new DialogsPanel();
+    private DialogsPanel dialogsPanel;
 
     public final ButtonGroup toolGroup = new ButtonGroup();
@@ -108 +108 @@
         toolGroup.setSelected(((AbstractButton)toolBarActions.getComponent(0)).getModel(), true);
 
-        JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true,
-                             mapView, dialogsPanel);
+        JSplitPane splitPane = new JSplitPane(JSplitPane.HORIZONTAL_SPLIT, true);
+        dialogsPanel = new DialogsPanel(splitPane);
+        splitPane.setLeftComponent(mapView);
+        splitPane.setRightComponent(dialogsPanel);
 
         /**

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

@@ -12 +12 @@
 import javax.swing.BoxLayout;
 import javax.swing.JPanel;
+import javax.swing.JSplitPane;
 
 import org.openstreetmap.josm.gui.MultiSplitLayout;
@@ -30 +31 @@
      */
     private List<JPanel> panels = new ArrayList<JPanel>();
+    
+    final private JSplitPane parent;
+    public DialogsPanel(JSplitPane parent) {
+        this.parent = parent;
+    }
 
     private boolean initialized = false;
@@ -259 +265 @@
         mSpltPane.getMultiSplitLayout().setFloatingDividers(true);
         mSpltPane.revalidate();
+
+        /**
+         * Hide the Panel, if there is nothing to show
+         */
+        if (numPanels == 1 && panels.get(N-1).getComponents().length == 0)
+        {
+            this.setVisible(false);
+        } else {
+            if (this.getWidth() != 0) { // only if josm started with hidden panel
+                this.setPreferredSize(new Dimension(this.getWidth(), 0));
+            }
+            this.setVisible(true);
+            parent.resetToPreferredSizes();
+        }
     }