- Button:

- In "Flat Light" theme, changed styles of focused and default buttons to avoid confusion with all other themes. Focused buttons now have a white background (was light blue) and a slightly wider border. The default button now has a light blue background (was white) and a thin border. In all other themes the default button also has colored background. - In "Flat Dark" theme, use slightly wider border for focused buttons. - CheckBox and RadioButton: In "Flat Dark" theme, use blueish background for focused components.
2026-02-13 15:27:16 -06:00 · 2021-01-31 20:02:24 +01:00
parent 526c25a02b
commit 0bcdc14909
17 changed files with 108 additions and 33 deletions
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatCheckBoxIcon.java
@@ -146,8 +146,14 @@ public class FlatCheckBoxIcon
 		paintBorder( c, g );

 		// paint background
-		g.setColor( FlatUIUtils.deriveColor( getBackground( c, selected ),
-			selected ? selectedBackground : background ) );
+		Color bg = FlatUIUtils.deriveColor( getBackground( c, selected ),
+			selected ? selectedBackground : background );
+		if( bg.getAlpha() < 255 ) {
+			// fill background with default color before filling with non-opaque background
+			g.setColor( selected ? selectedBackground : background );
+			paintBackground( c, g );
+		}
+		g.setColor( bg );
 		paintBackground( c, g );

 		// paint checkmark
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/icons/FlatHelpButtonIcon.java
@@ -31,6 +31,8 @@ import com.formdev.flatlaf.ui.FlatUIUtils;
 *
 * @uiDefault Component.focusWidth						int
 * @uiDefault Component.focusColor						Color
+ * @uiDefault HelpButton.innerFocusWidth				int or float	optional; defaults to Component.innerFocusWidth
+ * @uiDefault HelpButton.borderWidth					int		optional; default is 1
 * @uiDefault HelpButton.borderColor					Color
 * @uiDefault HelpButton.disabledBorderColor			Color
 * @uiDefault HelpButton.focusedBorderColor				Color
@@ -50,6 +52,8 @@ public class FlatHelpButtonIcon
 {
 	protected final int focusWidth = UIManager.getInt( "Component.focusWidth" );
 	protected final Color focusColor = UIManager.getColor( "Component.focusColor" );
+	protected final float innerFocusWidth = FlatUIUtils.getUIFloat( "HelpButton.innerFocusWidth", FlatUIUtils.getUIFloat( "Component.innerFocusWidth", 0 ) );
+	protected final int borderWidth = FlatUIUtils.getUIInt( "HelpButton.borderWidth", 1 );

 	protected final Color borderColor = UIManager.getColor( "HelpButton.borderColor" );
 	protected final Color disabledBorderColor = UIManager.getColor( "HelpButton.disabledBorderColor" );
@@ -84,12 +88,18 @@ public class FlatHelpButtonIcon
 		boolean enabled = c.isEnabled();
 		boolean focused = FlatUIUtils.isPermanentFocusOwner( c );

-		// paint focused border
+		float xy = 0.5f;
+		float wh = iconSize - 1;
+
+		// paint outer focus border
 		if( focused && FlatButtonUI.isFocusPainted( c ) ) {
 			g2.setColor( focusColor );
-			g2.fill( new Ellipse2D.Float( 0.5f, 0.5f, iconSize - 1, iconSize - 1 ) );
+			g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
 		}

+		xy += focusWidth;
+		wh -= (focusWidth * 2);
+
 		// paint border
 		g2.setColor( FlatButtonUI.buttonStateColor( c,
 			borderColor,
@@ -97,7 +107,19 @@ public class FlatHelpButtonIcon
 			focusedBorderColor,
 			hoverBorderColor,
 			null ) );
-		g2.fill( new Ellipse2D.Float( focusWidth + 0.5f, focusWidth + 0.5f, 21, 21 ) );
+		g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
+
+		xy += borderWidth;
+		wh -= (borderWidth * 2);
+
+		// paint inner focus border
+		if( innerFocusWidth > 0 && focused && FlatButtonUI.isFocusPainted( c ) ) {
+			g2.setColor( focusColor );
+			g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );
+
+			xy += innerFocusWidth;
+			wh -= (innerFocusWidth * 2);
+		}

 		// paint background
 		g2.setColor( FlatUIUtils.deriveColor( FlatButtonUI.buttonStateColor( c,
@@ -106,7 +128,7 @@ public class FlatHelpButtonIcon
 			focusedBackground,
 			hoverBackground,
 			pressedBackground ), background ) );
-		g2.fill( new Ellipse2D.Float( focusWidth + 1.5f, focusWidth + 1.5f, 19, 19 ) );
+		g2.fill( new Ellipse2D.Float( xy, xy, wh, wh ) );

 		// paint question mark
 		Path2D q = new Path2D.Float();
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatBorder.java
@@ -94,7 +94,7 @@ public class FlatBorder
 			// paint outer border
 			if( outlineColor != null || isFocused( c ) ) {
 				float innerWidth = !isCellEditor( c ) && !(c instanceof JScrollPane)
-					? (outlineColor != null ? innerOutlineWidth : innerFocusWidth)
+					? (outlineColor != null ? innerOutlineWidth : getInnerFocusWidth( c ))
 					: 0;

 				g2.setColor( (outlineColor != null) ? outlineColor : getFocusColor( c ) );
@@ -235,6 +235,13 @@ public class FlatBorder
 		return focusWidth;
 	}

+	/**
+	 * Returns the (unscaled) thickness of the inner focus border.
+	 */
+	protected float getInnerFocusWidth( Component c ) {
+		return innerFocusWidth;
+	}
+
 	/**
 	 * Returns the (unscaled) line thickness used to compute the border insets.
 	 * This may be different to {@link #getBorderWidth}.
--- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
+++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatButtonBorder.java
@@ -44,6 +44,7 @@ import com.formdev.flatlaf.util.UIScale;
 * @uiDefault Button.default.focusColor			Color
 * @uiDefault Button.borderWidth				int
 * @uiDefault Button.default.borderWidth		int
+ * @uiDefault Button.innerFocusWidth			int or float	optional; defaults to Component.innerFocusWidth
 * @uiDefault Button.toolbar.margin				Insets
 * @uiDefault Button.toolbar.spacingInsets		Insets
 * @uiDefault Button.arc						int
@@ -65,6 +66,7 @@ public class FlatButtonBorder
 	protected final Color defaultFocusColor = UIManager.getColor( "Button.default.focusColor" );
 	protected final int borderWidth = UIManager.getInt( "Button.borderWidth" );
 	protected final int defaultBorderWidth = UIManager.getInt( "Button.default.borderWidth" );
+	protected final float buttonInnerFocusWidth = FlatUIUtils.getUIFloat( "Button.innerFocusWidth", innerFocusWidth );
 	protected final Insets toolbarMargin = UIManager.getInsets( "Button.toolbar.margin" );
 	protected final Insets toolbarSpacingInsets = UIManager.getInsets( "Button.toolbar.spacingInsets" );
 	protected final int arc = UIManager.getInt( "Button.arc" );
@@ -134,6 +136,11 @@ public class FlatButtonBorder
 		return FlatToggleButtonUI.isTabButton( c ) ? 0 : super.getFocusWidth( c );
 	}

+	@Override
+	protected float getInnerFocusWidth( Component c ) {
+		return buttonInnerFocusWidth;
+	}
+
 	@Override
 	protected int getBorderWidth( Component c ) {
 		return FlatButtonUI.isDefaultButton( c ) ? defaultBorderWidth : borderWidth;
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarculaLaf.properties
@@ -33,9 +33,16 @@

 #---- Button ----

+Button.innerFocusWidth = 0
+
 Button.default.boldText = true


+#---- CheckBox ----
+
+CheckBox.icon.focusedBackground = null
+
+
 #---- Component ----

 Component.focusWidth = 2
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties
@@ -115,6 +115,7 @@ CheckBox.icon.disabledCheckmarkColor = #606060

 # focused
 CheckBox.icon.focusedBorderColor = #466D94
+CheckBox.icon.focusedBackground = fade($CheckBox.icon.focusedBorderColor,30%)

 # hover
 CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties
@@ -33,11 +33,10 @@

 #---- Button ----

-Button.focusedBackground = null
+Button.innerFocusWidth = 0

 Button.default.background = #4D8AC9
 Button.default.foreground = #fff
-Button.default.focusedBackground = null
 Button.default.borderColor = #3D75B2
 Button.default.hoverBorderColor = #A9C9F5
 Button.default.focusedBorderColor = #A9C9F5
@@ -49,6 +48,7 @@ Button.default.borderWidth = 1
 #---- CheckBox ----

 CheckBox.icon.style = filled
+CheckBox.icon.focusedBackground = null


 #---- Component ----
--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties
@@ -164,6 +164,7 @@ Button.defaultButtonFollowsFocus = false

 Button.borderWidth = 1
 Button.default.borderWidth = 1
+Button.innerFocusWidth = 1

 Button.toolbar.margin = 3,3,3,3
 Button.toolbar.spacingInsets = 1,2,1,2
@@ -284,12 +285,14 @@ HelpButton.focusedBorderColor = $CheckBox.icon.focusedBorderColor
 HelpButton.hoverBorderColor = $?CheckBox.icon.hoverBorderColor
 HelpButton.background = $CheckBox.icon.background
 HelpButton.disabledBackground = $CheckBox.icon.disabledBackground
-HelpButton.focusedBackground = $?CheckBox.icon.focusedBackground
 HelpButton.hoverBackground = $?CheckBox.icon.hoverBackground
 HelpButton.pressedBackground = $?CheckBox.icon.pressedBackground
 HelpButton.questionMarkColor = $CheckBox.icon.checkmarkColor
 HelpButton.disabledQuestionMarkColor = $CheckBox.icon.disabledCheckmarkColor

+HelpButton.borderWidth = $Button.borderWidth
+HelpButton.innerFocusWidth = $Button.innerFocusWidth
+

 #---- InternalFrame ----

--- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
+++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties
@@ -73,7 +73,6 @@ controlDkShadow = darken($controlShadow,15%)
 #---- Button ----

 Button.background = #fff
-Button.focusedBackground = #e3f1fa
 Button.hoverBackground = darken($Button.background,3%,derived)
 Button.pressedBackground = darken($Button.background,10%,derived)
 Button.selectedBackground = darken($Button.background,20%,derived)
@@ -85,16 +84,14 @@ Button.disabledBorderColor = $Component.disabledBorderColor
 Button.focusedBorderColor = $Component.focusedBorderColor
 Button.hoverBorderColor = $Button.focusedBorderColor

-Button.default.background = $Button.background
+Button.default.background = #e3f1fa
 Button.default.foreground = @foreground
-Button.default.focusedBackground = $Button.focusedBackground
 Button.default.hoverBackground = darken($Button.default.background,3%,derived)
 Button.default.pressedBackground = darken($Button.default.background,10%,derived)
 Button.default.borderColor = #4F9EE3
 Button.default.hoverBorderColor = $Button.hoverBorderColor
 Button.default.focusedBorderColor = $Button.focusedBorderColor
 Button.default.focusColor = $Component.focusColor
-Button.default.borderWidth = 2

 Button.toolbar.hoverBackground = darken($Button.background,12%,derived)
 Button.toolbar.pressedBackground = darken($Button.background,15%,derived)
@@ -117,7 +114,7 @@ CheckBox.icon.disabledCheckmarkColor = #ABABAB

 # focused
 CheckBox.icon.focusedBorderColor = #7B9FC7
-CheckBox.icon.focusedBackground = $Button.focusedBackground
+CheckBox.icon.focusedBackground = #e3f1fa

 # hover
 CheckBox.icon.hoverBorderColor = $CheckBox.icon.focusedBorderColor