From 97ca866ffaab2f0a581dc34632495e5e761a5eeb Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 23 Aug 2021 16:53:23 +0200 Subject: [PATCH] OptionPane: fixed `OptionPane.sameSizeButtons`, which did not work as expected when setting to `false` --- CHANGELOG.md | 2 ++ .../main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java | 7 +++++++ 2 files changed, 9 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index b3c3b977..e3cad8d6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -14,6 +14,8 @@ FlatLaf Change Log pressed) when running in Java 9+ on Linux, macOS. Occurs also on Windows in large popup menus that do not fit into the window. (issue #371; regression since FlatLaf 1.3) +- OptionPane: Fixed `OptionPane.sameSizeButtons`, which did not work as expected + when setting to `false`. ## 1.5 diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java index 7475ce9b..2bb2c8f9 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatOptionPaneUI.java @@ -91,6 +91,7 @@ public class FlatOptionPaneUI protected int messagePadding; protected int maxCharactersPerLine; private int focusWidth; + private boolean sameSizeButtons; public static ComponentUI createUI( JComponent c ) { return new FlatOptionPaneUI(); @@ -104,6 +105,7 @@ public class FlatOptionPaneUI messagePadding = UIManager.getInt( "OptionPane.messagePadding" ); maxCharactersPerLine = UIManager.getInt( "OptionPane.maxCharactersPerLine" ); focusWidth = UIManager.getInt( "Component.focusWidth" ); + sameSizeButtons = FlatUIUtils.getUIBoolean( "OptionPane.sameSizeButtons", true ); } @Override @@ -217,6 +219,11 @@ public class FlatOptionPaneUI return null; } + @Override + protected boolean getSizeButtonsToSameWidth() { + return sameSizeButtons; + } + //---- class NonUIResourceBorder ------------------------------------------ private static class NonUIResourceBorder