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

Button: replaced gradient border with single-color border

Browse Source
This commit is contained in:
Karl Tauber
2019-09-11 17:57:26 +02:00
parent 362c4f935b
commit 8604f51add
4 changed files with 11 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -19,7 +19,6 @@ package com.formdev.flatlaf.ui;
import static com.formdev.flatlaf.util.UIScale.scale; import static com.formdev.flatlaf.util.UIScale.scale;
import java.awt.Color; import java.awt.Color;
import java.awt.Component; import java.awt.Component;
import java.awt.GradientPaint;
import java.awt.Graphics; import java.awt.Graphics;
import java.awt.Paint; import java.awt.Paint;
import javax.swing.UIManager; import javax.swing.UIManager;
@@ -27,12 +26,10 @@ import javax.swing.UIManager;
/** /**
* Border for {@link javax.swing.JButton}. * Border for {@link javax.swing.JButton}.
* *
* @uiDefault Button.startBorderColor Color * @uiDefault Button.borderColor Color
* @uiDefault Button.endBorderColor Color
* @uiDefault Button.disabledBorderColor Color * @uiDefault Button.disabledBorderColor Color
* @uiDefault Button.focusedBorderColor Color * @uiDefault Button.focusedBorderColor Color
* @uiDefault Button.default.startBorderColor Color * @uiDefault Button.default.borderColor Color
* @uiDefault Button.default.endBorderColor Color
* @uiDefault Button.default.focusedBorderColor Color * @uiDefault Button.default.focusedBorderColor Color
* @uiDefault Button.default.focusColor Color * @uiDefault Button.default.focusColor Color
* @uiDefault Button.arc int * @uiDefault Button.arc int
@@ -42,12 +39,10 @@ import javax.swing.UIManager;
public class FlatButtonBorder public class FlatButtonBorder
extends FlatBorder extends FlatBorder
{ {
protected final Color startBorderColor = UIManager.getColor( "Button.startBorderColor" ); protected final Color borderColor = UIManager.getColor( "Button.borderColor" );
protected final Color endBorderColor = UIManager.getColor( "Button.endBorderColor" );
protected final Color disabledBorderColor = UIManager.getColor( "Button.disabledBorderColor" ); protected final Color disabledBorderColor = UIManager.getColor( "Button.disabledBorderColor" );
protected final Color focusedBorderColor = UIManager.getColor( "Button.focusedBorderColor" ); protected final Color focusedBorderColor = UIManager.getColor( "Button.focusedBorderColor" );
protected final Color defaultStartBorderColor = UIManager.getColor( "Button.default.startBorderColor" ); protected final Color defaultBorderColor = UIManager.getColor( "Button.default.borderColor" );
protected final Color defaultEndBorderColor = UIManager.getColor( "Button.default.endBorderColor" );
protected final Color defaultFocusedBorderColor = UIManager.getColor( "Button.default.focusedBorderColor" ); protected final Color defaultFocusedBorderColor = UIManager.getColor( "Button.default.focusedBorderColor" );
protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" ); protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
protected final int arc = UIManager.getInt( "Button.arc" ); protected final int arc = UIManager.getInt( "Button.arc" );
@@ -70,12 +65,7 @@ public class FlatButtonBorder
if( c.hasFocus() ) if( c.hasFocus() )
return def ? defaultFocusedBorderColor : focusedBorderColor; return def ? defaultFocusedBorderColor : focusedBorderColor;
Color startColor = def ? defaultStartBorderColor : startBorderColor; return def ? defaultBorderColor : borderColor;
Color endColor = def ? defaultEndBorderColor : endBorderColor;
return (startColor.equals( endColor ) )
? startColor
: new GradientPaint( 0, getFocusWidth(), startColor,
0, c.getHeight() - getFocusWidth() - 1f, endColor );
} else } else
return disabledBorderColor; return disabledBorderColor;
} }

6
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
View File

@@ -62,15 +62,13 @@ window=@background
Button.background=4c5052 Button.background=4c5052
Button.startBorderColor=5e6060 Button.borderColor=5e6060
Button.endBorderColor=5e6060
Button.disabledBorderColor=5e6060 Button.disabledBorderColor=5e6060
Button.focusedBorderColor=466d94 Button.focusedBorderColor=466d94
Button.default.background=365880 Button.default.background=365880
Button.default.foreground=bbbbbb Button.default.foreground=bbbbbb
Button.default.startBorderColor=4c708c Button.default.borderColor=4c708c
Button.default.endBorderColor=4c708c
Button.default.focusedBorderColor=537699 Button.default.focusedBorderColor=537699
Button.default.focusColor=43688c Button.default.focusColor=43688c

6
flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
View File

@@ -62,15 +62,13 @@ window=@background
Button.background=ffffff Button.background=ffffff
Button.startBorderColor=bfbfbf Button.borderColor=bfbfbf
Button.endBorderColor=b3b3b3
Button.disabledBorderColor=cfcfcf Button.disabledBorderColor=cfcfcf
Button.focusedBorderColor=87afda Button.focusedBorderColor=87afda
Button.default.background=4A86C7 Button.default.background=4A86C7
Button.default.foreground=f0f0f0 Button.default.foreground=f0f0f0
Button.default.startBorderColor=4779ba Button.default.borderColor=3167ad
Button.default.endBorderColor=3167ad
Button.default.focusedBorderColor=a8cef6 Button.default.focusedBorderColor=a8cef6
Button.default.focusColor=97c3f3 Button.default.focusColor=97c3f3

6
flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
View File

@@ -45,16 +45,14 @@
Button.background=ffffff Button.background=ffffff
Button.startBorderColor=ff0000 Button.borderColor=0000ff
Button.endBorderColor=0000ff
Button.disabledBorderColor=000088 Button.disabledBorderColor=000088
Button.focusedBorderColor=466d94 Button.focusedBorderColor=466d94
#Button.arc=10 #Button.arc=10
Button.default.background=dddddd Button.default.background=dddddd
Button.default.foreground=880000 Button.default.foreground=880000
Button.default.startBorderColor=ff0000 Button.default.borderColor=ff0000
Button.default.endBorderColor=ff0000
Button.default.focusedBorderColor=537699 Button.default.focusedBorderColor=537699
Button.default.focusColor=ff0000 Button.default.focusColor=ff0000