Ticket #22346: 22346.patch

src/org/openstreetmap/josm/gui/dialogs/LayerListDialog.java

@@ -384 +384 @@
         layerManager.removeActiveLayerChangeListener(activateLayerAction);
     }
 
+    @Override
+    protected int getPanelMaximumHeight() {
+        return this.layerList.getHeight() + this.layerList.getRowHeight();
+    }
+
+    @Override
+    protected int getPanelMinimumHeight() {
+        return Math.min(4 * this.layerList.getRowHeight(), getPanelMaximumHeight());
+    }
+
     /**
      * Returns the layer list model.
      * @return the layer list model

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

@@ -909 +909 @@
         return new Dimension(dialogsPanel.getWidth(), preferredHeight);
     }
 
+    /**
+     * Return the maximum height for the dialog given the current contents
+     * @return The maximum height
+     * @since xxx
+     */
+    protected int getPanelMaximumHeight() {
+        return Integer.MIN_VALUE;
+    }
+
+    /**
+     * Return the minimum height for the dialog given the current contents
+     * @return The minimum height
+     * @since xxx
+     */
+    protected int getPanelMinimumHeight() {
+        return Integer.MIN_VALUE;
+    }
+
+    @Override
+    public Dimension getMaximumSize() {
+        if (!this.isCollapsed) {
+            int maxHeight = this.getPanelMaximumHeight();
+            if (maxHeight >= preferredHeight) {
+                // Use preferred, since maximum is not bounded for all intents and purposes.
+                Dimension buttons = this.buttonsPanel.getPreferredSize();
+                Dimension title = this.titleBar.getPreferredSize();
+                return new Dimension(this.dialogsPanel.getWidth(), title.height + maxHeight + buttons.height);
+            }
+        }
+        return super.getMaximumSize();
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        if (!this.isCollapsed) {
+            int minimumHeight = this.getPanelMinimumHeight();
+            if (minimumHeight > 0) {
+                Dimension buttons = this.buttonsPanel.getMinimumSize();
+                Dimension title = this.titleBar.getMinimumSize();
+                return new Dimension(Math.max(buttons.width, title.width), title.height + minimumHeight + buttons.height);
+            }
+        }
+        return super.getMaximumSize();
+    }
+
     /**
      * Do something when the toggleButton is pressed.
      */

src/org/openstreetmap/josm/gui/widgets/ScrollableTable.java

@@ -2 +2 @@
 package org.openstreetmap.josm.gui.widgets;
 
 import java.awt.Container;
+import java.awt.Dimension;
 import java.awt.Point;
 import java.awt.Rectangle;
 
@@ -43 +44 @@
             viewport.scrollRectToVisible(rect);
         }
     }
+
+    @Override
+    public Dimension getPreferredSize() {
+        if (super.isPreferredSizeSet()) {
+            return super.getPreferredSize();
+        }
+        Dimension pref = super.getPreferredSize();
+        return new Dimension(pref.width, this.getRowHeight() * this.getRowCount());
+    }
+
+    @Override
+    public Dimension getMaximumSize() {
+        if (isMaximumSizeSet()) {
+            return super.getMaximumSize();
+        }
+        Dimension max = super.getMaximumSize();
+        return new Dimension(max.width, this.getRowHeight() * (this.getRowCount() + 1));
+    }
+
+    @Override
+    public Dimension getMinimumSize() {
+        if (this.isMinimumSizeSet()) {
+            return super.getMinimumSize();
+        }
+        Dimension min = super.getMinimumSize();
+        return new Dimension(min.width, this.getRowHeight());
+    }
 }