angel/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2026-02-11 06:27:13 -06:00
Code Issues Packages Projects Releases Wiki Activity

Button: invoke FlatButtonUI.getForeground(c) also if component is disabled to be consistent with getBackground(c)

Browse Source
This commit is contained in:
Karl Tauber
2020-06-23 12:45:25 +02:00
parent 27eeb0a636
commit b72916187a
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonUI.java
View File

@@ -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 ) { 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 ) { protected Color getForeground( JComponent c ) {
if( !c.isEnabled() )
return disabledText;
boolean def = isDefaultButton( c ); boolean def = isDefaultButton( c );
return def ? defaultForeground : c.getForeground(); return def ? defaultForeground : c.getForeground();
} }

4
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatToggleButtonUI.java
View File

@@ -206,9 +206,7 @@ public class FlatToggleButtonUI
@Override @Override
protected Color getForeground( JComponent c ) { protected Color getForeground( JComponent c ) {
ButtonModel model = ((AbstractButton)c).getModel(); if( c.isEnabled() && ((AbstractButton)c).isSelected() && !isToolBarButton( c ) )
if( model.isSelected() && !isToolBarButton( c ) )
return selectedForeground; return selectedForeground;
return super.getForeground( c ); return super.getForeground( c );