Ticket #24808: JosmToggleDialog.patch

File JosmToggleDialog.patch, 2.3 KB (added by dmitry.v.kiselev@…, 4 days ago)

src path

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

    diff --git a/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java b/src/org/openstreetmap/josm/gui/dialogs/ToggleDialog.java
index 2ecea9d1d2..0222510d95 100644
    a b public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help  
    103103    public static final BooleanProperty PROP_DYNAMIC_BUTTONS = new BooleanProperty("dialog.dynamic.buttons", false);
    104104    private static final String SELECTED = "selected";
    105105
     106    private static final int TITLE_HEIGHT =
     107        (int)(20 * Config.getPref().getDouble("gui.scale", 1.0));
     108
    106109    private final transient ParametrizedEnumProperty<ButtonHidingType> propButtonHiding =
    107110            new ParametrizedEnumProperty<>(ButtonHidingType.class, ButtonHidingType.DYNAMIC) {
    108111                @Override
    … … public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help  
    442445        if (isDialogInDefaultView()) {
    443446            setContentVisible(false);
    444447            setIsCollapsed(true);
    445             setPreferredSize(new Dimension(0, 20));
    446             setMaximumSize(new Dimension(Integer.MAX_VALUE, 20));
    447             setMinimumSize(new Dimension(Integer.MAX_VALUE, 20));
     448            setPreferredSize(new Dimension(0, TITLE_HEIGHT));
     449            setMaximumSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
     450            setMinimumSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
    448451            titleBar.lblMinimized.setIcon(ImageProvider.get("misc", "minimized"));
    449452        } else
    450453            throw new IllegalStateException();
    … … public class ToggleDialog extends JPanel implements ShowHideButtonListener, Help  
    569572                    lblTitle.paint(g);
    570573                }
    571574            };
    572             lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, 20));
    573             lblTitleWeak.setMinimumSize(new Dimension(0, 20));
     575            lblTitleWeak.setPreferredSize(new Dimension(Integer.MAX_VALUE, TITLE_HEIGHT));
     576            lblTitleWeak.setMinimumSize(new Dimension(0, TITLE_HEIGHT));
    574577            add(lblTitleWeak, GBC.std().fill(GridBagConstraints.HORIZONTAL));
    575578
    576579            buttonsHide = new JButton(ImageProvider.get("misc", buttonHiding != ButtonHidingType.ALWAYS_SHOWN