From 8c2be1b4067260e21fb6dc0fde7ffdd5a7ab83f1 Mon Sep 17 00:00:00 2001
From: Karl Tauber <karl@jformdesigner.com>
Date: Fri, 29 Oct 2021 14:09:58 +0200
Subject: [PATCH] FlatButtonBorder: removed fields that override fields from
 FlatBorder

---
 .../main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java | 7 ++++---
 1 file changed, 4 insertions(+), 3 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 ac41d33f..8917f559 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
@@ -58,10 +58,7 @@ import com.formdev.flatlaf.util.UIScale;
 public class FlatButtonBorder
 	extends FlatBorder
 {
-	@Styleable protected Color borderColor = FlatUIUtils.getUIColor( "Button.startBorderColor", "Button.borderColor" );
 	protected Color endBorderColor = UIManager.getColor( "Button.endBorderColor" );
-	@Styleable protected Color disabledBorderColor = UIManager.getColor( "Button.disabledBorderColor" );
-	@Styleable protected Color focusedBorderColor = UIManager.getColor( "Button.focusedBorderColor" );
 	@Styleable protected Color hoverBorderColor = UIManager.getColor( "Button.hoverBorderColor" );
 
 	@Styleable(dot=true) protected Color defaultBorderColor = FlatUIUtils.getUIColor( "Button.default.startBorderColor", "Button.default.borderColor" );
@@ -82,6 +79,10 @@ public class FlatButtonBorder
 
 	public FlatButtonBorder() {
 		innerFocusWidth = FlatUIUtils.getUIFloat( "Button.innerFocusWidth", innerFocusWidth );
+
+		borderColor = FlatUIUtils.getUIColor( "Button.startBorderColor", "Button.borderColor" );
+		disabledBorderColor = UIManager.getColor( "Button.disabledBorderColor" );
+		focusedBorderColor = UIManager.getColor( "Button.focusedBorderColor" );
 	}
 
 	@Override