From 469e5bd179612d8dd5f94b1ab3a6cbb57c68c431 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 14 Dec 2019 00:05:47 +0100 Subject: [PATCH] ToggleButton: removed "ToggleButton.arc" because it was only used for the background, but not for the border, which is painted in FlatButtonBorder --- .../src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java | 2 +- .../main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java | 2 +- .../src/main/resources/com/formdev/flatlaf/FlatLaf.properties | 1 - 3 files changed, 2 insertions(+), 3 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java index c42075d7..92f73a2f 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java @@ -134,7 +134,7 @@ public class FlatButtonUI String prefix = getPropertyPrefix(); focusWidth = UIManager.getInt( "Component.focusWidth" ); - arc = UIManager.getInt( prefix + "arc" ); + arc = UIManager.getInt( "Button.arc" ); minimumWidth = UIManager.getInt( prefix + "minimumWidth" ); iconTextGap = FlatUIUtils.getUIInt( prefix + "iconTextGap", 4 ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java index 827cc056..e35a390b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java @@ -38,7 +38,7 @@ import javax.swing.plaf.ComponentUI; * * * @uiDefault Component.focusWidth int - * @uiDefault ToggleButton.arc int + * @uiDefault Button.arc int * @uiDefault ToggleButton.minimumWidth int * @uiDefault ToggleButton.iconTextGap int * @uiDefault ToggleButton.startBackground Color optional; if set, a gradient paint is used and ToggleButton.background is ignored diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index 953d0c41..a1d71043 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -401,7 +401,6 @@ TitledBorder.border=1,1,1,1,@@Separator.foreground #---- ToggleButton ---- ToggleButton.border=com.formdev.flatlaf.ui.FlatButtonBorder -ToggleButton.arc=6 ToggleButton.margin=2,14,2,14 ToggleButton.iconTextGap=4 ToggleButton.rollover=true