From 8604f51add364c9ed15cd78fb9f151d79623a70c Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Wed, 11 Sep 2019 17:57:26 +0200
Subject: [PATCH] Button: replaced gradient border with single-color border

---
 .../formdev/flatlaf/ui/FlatButtonBorder.java  | 20 +++++--------------
 .../formdev/flatlaf/FlatDarkLaf.properties    |  6 ++----
 .../formdev/flatlaf/FlatLightLaf.properties   |  6 ++----
 .../formdev/flatlaf/FlatTestLaf.properties    |  6 ++----
 4 files changed, 11 insertions(+), 27 deletions(-)

diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
index 5af58fe3..322c4300 100644
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
@@ -19,7 +19,6 @@ package com.formdev.flatlaf.ui;
 import static com.formdev.flatlaf.util.UIScale.scale;
 import java.awt.Color;
 import java.awt.Component;
-import java.awt.GradientPaint;
 import java.awt.Graphics;
 import java.awt.Paint;
 import javax.swing.UIManager;
@@ -27,12 +26,10 @@ import javax.swing.UIManager;
 /**
  * Border for {@link javax.swing.JButton}.
  *
- * @uiDefault Button.startBorderColor			Color
- * @uiDefault Button.endBorderColor				Color
+ * @uiDefault Button.borderColor				Color
  * @uiDefault Button.disabledBorderColor		Color
  * @uiDefault Button.focusedBorderColor			Color
- * @uiDefault Button.default.startBorderColor	Color
- * @uiDefault Button.default.endBorderColor		Color
+ * @uiDefault Button.default.borderColor		Color
  * @uiDefault Button.default.focusedBorderColor	Color
  * @uiDefault Button.default.focusColor			Color
  * @uiDefault Button.arc						int
@@ -42,12 +39,10 @@ import javax.swing.UIManager;
 public class FlatButtonBorder
 	extends FlatBorder
 {
-	protected final Color startBorderColor = UIManager.getColor( "Button.startBorderColor" );
-	protected final Color endBorderColor = UIManager.getColor( "Button.endBorderColor" );
+	protected final Color borderColor = UIManager.getColor( "Button.borderColor" );
 	protected final Color disabledBorderColor = UIManager.getColor( "Button.disabledBorderColor" );
 	protected final Color focusedBorderColor = UIManager.getColor( "Button.focusedBorderColor" );
-	protected final Color defaultStartBorderColor = UIManager.getColor( "Button.default.startBorderColor" );
-	protected final Color defaultEndBorderColor = UIManager.getColor( "Button.default.endBorderColor" );
+	protected final Color defaultBorderColor = UIManager.getColor( "Button.default.borderColor" );
 	protected final Color defaultFocusedBorderColor = UIManager.getColor( "Button.default.focusedBorderColor" );
 	protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
 	protected final int arc = UIManager.getInt( "Button.arc" );
@@ -70,12 +65,7 @@ public class FlatButtonBorder
 			if( c.hasFocus() )
 				return def ? defaultFocusedBorderColor : focusedBorderColor;
 
-			Color startColor = def ? defaultStartBorderColor : startBorderColor;
-			Color endColor = def ? defaultEndBorderColor : endBorderColor;
-			return (startColor.equals( endColor ) )
-				? startColor
-				: new GradientPaint( 0, getFocusWidth(), startColor,
-					0, c.getHeight() - getFocusWidth() - 1f, endColor );
+			return def ? defaultBorderColor : borderColor;
 		} else
 			return disabledBorderColor;
 	}
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
index ce9515fe..5605bd88 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
@@ -62,15 +62,13 @@ window=@background
 
 Button.background=4c5052
 
-Button.startBorderColor=5e6060
-Button.endBorderColor=5e6060
+Button.borderColor=5e6060
 Button.disabledBorderColor=5e6060
 Button.focusedBorderColor=466d94
 
 Button.default.background=365880
 Button.default.foreground=bbbbbb
-Button.default.startBorderColor=4c708c
-Button.default.endBorderColor=4c708c
+Button.default.borderColor=4c708c
 Button.default.focusedBorderColor=537699
 Button.default.focusColor=43688c
 
diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
index 0c99c5ba..f822071e 100644
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
@@ -62,15 +62,13 @@ window=@background
 
 Button.background=ffffff
 
-Button.startBorderColor=bfbfbf
-Button.endBorderColor=b3b3b3
+Button.borderColor=bfbfbf
 Button.disabledBorderColor=cfcfcf
 Button.focusedBorderColor=87afda
 
 Button.default.background=4A86C7
 Button.default.foreground=f0f0f0
-Button.default.startBorderColor=4779ba
-Button.default.endBorderColor=3167ad
+Button.default.borderColor=3167ad
 Button.default.focusedBorderColor=a8cef6
 Button.default.focusColor=97c3f3
 
diff --git a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
index 6f3819eb..e8d07cd5 100644
--- a/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
+++ b/flatlaf-core/src/test/resources/com/formdev/flatlaf/FlatTestLaf.properties
@@ -45,16 +45,14 @@
 
 Button.background=ffffff
 
-Button.startBorderColor=ff0000
-Button.endBorderColor=0000ff
+Button.borderColor=0000ff
 Button.disabledBorderColor=000088
 Button.focusedBorderColor=466d94
 #Button.arc=10
 
 Button.default.background=dddddd
 Button.default.foreground=880000
-Button.default.startBorderColor=ff0000
-Button.default.endBorderColor=ff0000
+Button.default.borderColor=ff0000
 Button.default.focusedBorderColor=537699
 Button.default.focusColor=ff0000