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

moved TestFlatIconNullComponent to other package and fixed file name (issue #483)

Browse Source
This commit is contained in:
Karl Tauber
2022-02-25 15:52:40 +01:00
parent c7fa475128
commit 016e515ae2
3 changed files with 14 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -573,7 +573,10 @@ public class FlatButtonUI
public static Color buttonStateColor( Component c, Color enabledColor, Color disabledColor,
Color focusedColor, Color hoverColor, Color pressedColor )
{
if(c != null && !c.isEnabled() )
if( c == null )
return enabledColor;
if( !c.isEnabled() )
return disabledColor;
if( c instanceof AbstractButton ) {
@@ -586,7 +589,7 @@ public class FlatButtonUI
return hoverColor;
}
if( c != null && focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) )
if( focusedColor != null && isFocusPainted( c ) && FlatUIUtils.isPermanentFocusOwner( c ) )
return focusedColor;
return enabledColor;