Ticket #24808: JosmToggleDialog.2.patch

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

@@ -157 +157 @@
     /** the preferred height if the toggle dialog is expanded */
     private final int preferredHeight;
 
+    /** the height of the title bar */
+    private final int titleHeight;
+
     /** the JDialog displaying the toggle dialog as undocked dialog */
     protected JDialog detachedDialog;
 
@@ -263 +266 @@
         /* Override any minimum sizes of child elements so the user can resize freely */
         setMinimumSize(new Dimension(0, 0));
         this.preferredHeight = Config.getPref().getInt(preferencePrefix+".preferredHeight", preferredHeight);
+        this.titleHeight = Config.getPref().getInt("toggledialog.titlebar.height", 
+            (int)(20 * Config.getPref().getDouble("gui.scale", 1.0)));
         toggleAction = new ToggleDialogAction(name, "dialogs/"+iconName, tooltip, shortcut, helpTopic());
 
         isShowing = Config.getPref().getBoolean(preferencePrefix+".visible", defShow);
@@ -442 +447 @@
         if (isDialogInDefaultView()) {
             setContentVisible(false);
             setIsCollapsed(true);
-            setPreferredSize(new Dimension(0, 20));
-            setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
-            setMinimumSize(new Dimension(Integer.MAX_VALUE, 20));
+            setPreferredSize(new Dimension(0, titleHeight));
+            setMaximumSize(new Dimension(Integer.MAX_VALUE, titleHeight));
+            setMinimumSize(new Dimension(Integer.MAX_VALUE, titleHeight));
             titleBar.lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
         } else
             throw new IllegalStateException();
@@ -569 +574 @@
                     lblTitle.paint(g);
                 }
             };
-            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, 20));
-            lblTitleWeak.setMinimumSize(new Dimension(0, 20));
+            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, titleHeight));
+            lblTitleWeak.setMinimumSize(new Dimension(0, titleHeight));
             add(lblTitleWeak, GBC.std().fill(GridBagConstraints.HORIZONTAL));
 
             buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN