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

Button and ToggleButton: selected buttons did not use explicitly set foreground color (issue #756)

Browse Source
This commit is contained in:
Karl Tauber
2023-10-29 20:15:02 +01:00
parent 9602b191a9
commit 808f5a6381
2 changed files with 7 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG.md
View File

@@ -5,6 +5,8 @@ FlatLaf Change Log
#### Fixed bugs #### Fixed bugs
- Button and ToggleButton: Selected buttons did not use explicitly set
foreground color. (issue 756)
- Table: Switching theme looses table grid and intercell spacing. (issues #733 - Table: Switching theme looses table grid and intercell spacing. (issues #733
and #750) and #750)

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

@@ -721,14 +721,15 @@ public class FlatButtonUI
} }
protected Color getForeground( JComponent c ) { protected Color getForeground( JComponent c ) {
Color fg = c.getForeground();
boolean toolBarButton = isToolBarButton( c ) || isBorderlessButton( c ); boolean toolBarButton = isToolBarButton( c ) || isBorderlessButton( c );
// selected state // selected state
if( ((AbstractButton)c).isSelected() ) { if( ((AbstractButton)c).isSelected() ) {
return buttonStateColor( c, return buttonStateColor( c,
toolBarButton toolBarButton
? (toolbarSelectedForeground != null ? toolbarSelectedForeground : c.getForeground()) ? (toolbarSelectedForeground != null ? toolbarSelectedForeground : fg)
: selectedForeground, : (isCustomForeground( fg ) ? fg : selectedForeground),
toolBarButton toolBarButton
? (toolbarDisabledSelectedForeground != null ? toolbarDisabledSelectedForeground : disabledText) ? (toolbarDisabledSelectedForeground != null ? toolbarDisabledSelectedForeground : disabledText)
: (disabledSelectedForeground != null ? disabledSelectedForeground : disabledText), : (disabledSelectedForeground != null ? disabledSelectedForeground : disabledText),
@@ -740,7 +741,7 @@ public class FlatButtonUI
// toolbar button // toolbar button
if( toolBarButton ) { if( toolBarButton ) {
return buttonStateColor( c, return buttonStateColor( c,
c.getForeground(), fg,
disabledText, disabledText,
null, null,
toolbarHoverForeground, toolbarHoverForeground,
@@ -751,7 +752,7 @@ public class FlatButtonUI
return buttonStateColor( c, return buttonStateColor( c,
getForegroundBase( c, def ), getForegroundBase( c, def ),
disabledText, disabledText,
isCustomForeground( c.getForeground() ) ? null : (def ? defaultFocusedForeground : focusedForeground), isCustomForeground( fg ) ? null : (def ? defaultFocusedForeground : focusedForeground),
def ? defaultHoverForeground : hoverForeground, def ? defaultHoverForeground : hoverForeground,
def ? defaultPressedForeground : pressedForeground ); def ? defaultPressedForeground : pressedForeground );
} }