Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-09 16:25:10 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

Button: use FlatButtonUI.buttonStateColor() in button border

Browse Source
This commit is contained in:
Karl Tauber
2019-09-12 19:14:19 +02:00
parent 12ee41b443
commit c7ca3c5f9a
1 changed files with 7 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
View File

@@ -21,7 +21,6 @@ import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Paint; import java.awt.Paint;
import javax.swing.AbstractButton;
import javax.swing.UIManager; import javax.swing.UIManager;
/** /**
@@ -65,21 +64,13 @@ public class FlatButtonBorder
@Override @Override
protected Paint getBorderColor( Component c ) { protected Paint getBorderColor( Component c ) {
if( c.isEnabled() ) { boolean def = FlatButtonUI.isDefaultButton( c );
boolean def = FlatButtonUI.isDefaultButton( c ); return FlatButtonUI.buttonStateColor( c,
def ? defaultBorderColor : borderColor,
if( c instanceof AbstractButton && ((AbstractButton)c).getModel().isRollover() ) { disabledBorderColor,
Color color = def ? defaultHoverBorderColor : hoverBorderColor; def ? defaultFocusedBorderColor : focusedBorderColor,
if( color != null ) def ? defaultHoverBorderColor : hoverBorderColor,
return color; null );
}
if( c.hasFocus() )
return def ? defaultFocusedBorderColor : focusedBorderColor;
return def ? defaultBorderColor : borderColor;
} else
return disabledBorderColor;
} }
@Override @Override