From b72916187a0abb98dfda837c81fadea71e0360fd Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Tue, 23 Jun 2020 12:45:25 +0200 Subject: [PATCH] Button: invoke FlatButtonUI.getForeground(c) also if component is disabled to be consistent with getBackground(c) --- .../src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java | 5 ++++- .../main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java | 4 +--- 2 files changed, 5 insertions(+), 4 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 f6a27663..e18235cd 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 @@ -350,7 +350,7 @@ public class FlatButtonUI } } - paintText( g, b, textRect, text, b.isEnabled() ? getForeground( b ) : disabledText ); + paintText( g, b, textRect, text, getForeground( b ) ); } public static void paintText( Graphics g, AbstractButton b, Rectangle textRect, String text, Color foreground ) { @@ -408,6 +408,9 @@ public class FlatButtonUI } protected Color getForeground( JComponent c ) { + if( !c.isEnabled() ) + return disabledText; + boolean def = isDefaultButton( c ); return def ? defaultForeground : c.getForeground(); } 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 6eda8cc0..a4f25112 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 @@ -206,9 +206,7 @@ public class FlatToggleButtonUI @Override protected Color getForeground( JComponent c ) { - ButtonModel model = ((AbstractButton)c).getModel(); - - if( model.isSelected() && !isToolBarButton( c ) ) + if( c.isEnabled() && ((AbstractButton)c).isSelected() && !isToolBarButton( c ) ) return selectedForeground; return super.getForeground( c );