From 3834d93c9d0dc54421806ac0327b3306d4b106a0 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 1 Oct 2021 13:41:49 +0200 Subject: [PATCH] ComboBox and Spinner: - added `buttonSeparatorColor` and `buttonDisabledSeparatorColor` - fixed styling of `borderColor` and `disabledBorderColor` --- .../com/formdev/flatlaf/IntelliJTheme.java | 6 ++++ .../formdev/flatlaf/ui/FlatComboBoxUI.java | 28 ++++++++++--------- .../com/formdev/flatlaf/ui/FlatSpinnerUI.java | 27 ++++++++++-------- .../com/formdev/flatlaf/FlatLaf.properties | 4 +++ .../flatlaf/ui/TestFlatStyleableInfo.java | 8 +++--- .../formdev/flatlaf/ui/TestFlatStyling.java | 8 +++--- .../uidefaults/FlatDarkLaf_1.8.0_202.txt | 4 +++ .../uidefaults/FlatLightLaf_1.8.0_202.txt | 4 +++ .../uidefaults/FlatTestLaf_1.8.0_202.txt | 4 +++ .../flatlaf/themeeditor/FlatLafUIKeys.txt | 4 +++ 10 files changed, 64 insertions(+), 33 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index 554f7d2b..5e2f7bdf 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -549,6 +549,8 @@ public class IntelliJTheme uiKeyMapping.put( "ComboBox.ArrowButton.disabledIconColor", "ComboBox.buttonDisabledArrowColor" ); uiKeyMapping.put( "ComboBox.ArrowButton.iconColor", "ComboBox.buttonArrowColor" ); uiKeyMapping.put( "ComboBox.ArrowButton.nonEditableBackground", "ComboBox.buttonBackground" ); + uiKeyCopying.put( "ComboBox.buttonSeparatorColor", "Component.borderColor" ); + uiKeyCopying.put( "ComboBox.buttonDisabledSeparatorColor", "Component.disabledBorderColor" ); // Component uiKeyMapping.put( "Component.inactiveErrorFocusColor", "Component.error.borderColor" ); @@ -594,6 +596,10 @@ public class IntelliJTheme uiKeyCopying.put( "Slider.thumbColor", "ProgressBar.foreground" ); uiKeyCopying.put( "Slider.trackColor", "ProgressBar.background" ); + // Spinner + uiKeyCopying.put( "Spinner.buttonSeparatorColor", "Component.borderColor" ); + uiKeyCopying.put( "Spinner.buttonDisabledSeparatorColor", "Component.disabledBorderColor" ); + // TitlePane uiKeyCopying.put( "TitlePane.inactiveBackground", "TitlePane.background" ); uiKeyMapping.put( "TitlePane.infoForeground", "TitlePane.foreground" ); diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java index ffff65ff..8358335c 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatComboBoxUI.java @@ -95,8 +95,6 @@ import com.formdev.flatlaf.util.SystemInfo; * @uiDefault ComboBox.buttonStyle String auto (default), button or none * @uiDefault Component.arrowType String chevron (default) or triangle * @uiDefault Component.isIntelliJTheme boolean - * @uiDefault Component.borderColor Color - * @uiDefault Component.disabledBorderColor Color * @uiDefault ComboBox.editableBackground Color optional; defaults to ComboBox.background * @uiDefault ComboBox.focusedBackground Color optional * @uiDefault ComboBox.disabledBackground Color @@ -104,6 +102,8 @@ import com.formdev.flatlaf.util.SystemInfo; * @uiDefault ComboBox.buttonBackground Color * @uiDefault ComboBox.buttonEditableBackground Color * @uiDefault ComboBox.buttonFocusedBackground Color optional; defaults to ComboBox.focusedBackground + * @uiDefault ComboBox.buttonSeparatorColor Color optional + * @uiDefault ComboBox.buttonDisabledSeparatorColor Color optional * @uiDefault ComboBox.buttonArrowColor Color * @uiDefault ComboBox.buttonDisabledArrowColor Color * @uiDefault ComboBox.buttonHoverArrowColor Color @@ -121,8 +121,6 @@ public class FlatComboBoxUI @Styleable protected String buttonStyle; @Styleable protected String arrowType; protected boolean isIntelliJTheme; - @Styleable protected Color borderColor; - @Styleable protected Color disabledBorderColor; @Styleable protected Color editableBackground; @Styleable protected Color focusedBackground; @@ -132,6 +130,8 @@ public class FlatComboBoxUI @Styleable protected Color buttonBackground; @Styleable protected Color buttonEditableBackground; @Styleable protected Color buttonFocusedBackground; + /** @since 2 */ @Styleable protected Color buttonSeparatorColor; + /** @since 2 */ @Styleable protected Color buttonDisabledSeparatorColor; @Styleable protected Color buttonArrowColor; @Styleable protected Color buttonDisabledArrowColor; @Styleable protected Color buttonHoverArrowColor; @@ -215,8 +215,6 @@ public class FlatComboBoxUI buttonStyle = UIManager.getString( "ComboBox.buttonStyle" ); arrowType = UIManager.getString( "Component.arrowType" ); isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" ); - borderColor = UIManager.getColor( "Component.borderColor" ); - disabledBorderColor = UIManager.getColor( "Component.disabledBorderColor" ); editableBackground = UIManager.getColor( "ComboBox.editableBackground" ); focusedBackground = UIManager.getColor( "ComboBox.focusedBackground" ); @@ -226,6 +224,8 @@ public class FlatComboBoxUI buttonBackground = UIManager.getColor( "ComboBox.buttonBackground" ); buttonFocusedBackground = UIManager.getColor( "ComboBox.buttonFocusedBackground" ); buttonEditableBackground = UIManager.getColor( "ComboBox.buttonEditableBackground" ); + buttonSeparatorColor = UIManager.getColor( "ComboBox.buttonSeparatorColor" ); + buttonDisabledSeparatorColor = UIManager.getColor( "ComboBox.buttonDisabledSeparatorColor" ); buttonArrowColor = UIManager.getColor( "ComboBox.buttonArrowColor" ); buttonDisabledArrowColor = UIManager.getColor( "ComboBox.buttonDisabledArrowColor" ); buttonHoverArrowColor = UIManager.getColor( "ComboBox.buttonHoverArrowColor" ); @@ -247,9 +247,6 @@ public class FlatComboBoxUI protected void uninstallDefaults() { super.uninstallDefaults(); - borderColor = null; - disabledBorderColor = null; - editableBackground = null; focusedBackground = null; disabledBackground = null; @@ -258,6 +255,8 @@ public class FlatComboBoxUI buttonBackground = null; buttonEditableBackground = null; buttonFocusedBackground = null; + buttonSeparatorColor = null; + buttonDisabledSeparatorColor = null; buttonArrowColor = null; buttonDisabledArrowColor = null; buttonHoverArrowColor = null; @@ -555,10 +554,13 @@ public class FlatComboBoxUI // paint vertical line between value and arrow button if( paintButton ) { - g2.setColor( enabled ? borderColor : disabledBorderColor ); - float lw = scale( 1f ); - float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw; - g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2)) ); + Color separatorColor = enabled ? buttonSeparatorColor : buttonDisabledSeparatorColor; + if( separatorColor != null ) { + g2.setColor( separatorColor ); + float lw = scale( 1f ); + float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw; + g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2)) ); + } } } diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java index 42c815d6..79935f33 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSpinnerUI.java @@ -68,12 +68,12 @@ import com.formdev.flatlaf.util.LoggingFacade; * @uiDefault Spinner.buttonStyle String button (default) or none * @uiDefault Component.arrowType String chevron (default) or triangle * @uiDefault Component.isIntelliJTheme boolean - * @uiDefault Component.borderColor Color - * @uiDefault Component.disabledBorderColor Color * @uiDefault Spinner.disabledBackground Color * @uiDefault Spinner.disabledForeground Color * @uiDefault Spinner.focusedBackground Color optional * @uiDefault Spinner.buttonBackground Color + * @uiDefault Spinner.buttonSeparatorColor Color optional + * @uiDefault Spinner.buttonDisabledSeparatorColor Color optional * @uiDefault Spinner.buttonArrowColor Color * @uiDefault Spinner.buttonDisabledArrowColor Color * @uiDefault Spinner.buttonHoverArrowColor Color @@ -92,12 +92,12 @@ public class FlatSpinnerUI @Styleable protected String buttonStyle; @Styleable protected String arrowType; protected boolean isIntelliJTheme; - @Styleable protected Color borderColor; - @Styleable protected Color disabledBorderColor; @Styleable protected Color disabledBackground; @Styleable protected Color disabledForeground; @Styleable protected Color focusedBackground; @Styleable protected Color buttonBackground; + /** @since 2 */ @Styleable protected Color buttonSeparatorColor; + /** @since 2 */ @Styleable protected Color buttonDisabledSeparatorColor; @Styleable protected Color buttonArrowColor; @Styleable protected Color buttonDisabledArrowColor; @Styleable protected Color buttonHoverArrowColor; @@ -128,12 +128,12 @@ public class FlatSpinnerUI buttonStyle = UIManager.getString( "Spinner.buttonStyle" ); arrowType = UIManager.getString( "Component.arrowType" ); isIntelliJTheme = UIManager.getBoolean( "Component.isIntelliJTheme" ); - borderColor = UIManager.getColor( "Component.borderColor" ); - disabledBorderColor = UIManager.getColor( "Component.disabledBorderColor" ); disabledBackground = UIManager.getColor( "Spinner.disabledBackground" ); disabledForeground = UIManager.getColor( "Spinner.disabledForeground" ); focusedBackground = UIManager.getColor( "Spinner.focusedBackground" ); buttonBackground = UIManager.getColor( "Spinner.buttonBackground" ); + buttonSeparatorColor = UIManager.getColor( "Spinner.buttonSeparatorColor" ); + buttonDisabledSeparatorColor = UIManager.getColor( "Spinner.buttonDisabledSeparatorColor" ); buttonArrowColor = UIManager.getColor( "Spinner.buttonArrowColor" ); buttonDisabledArrowColor = UIManager.getColor( "Spinner.buttonDisabledArrowColor" ); buttonHoverArrowColor = UIManager.getColor( "Spinner.buttonHoverArrowColor" ); @@ -147,12 +147,12 @@ public class FlatSpinnerUI protected void uninstallDefaults() { super.uninstallDefaults(); - borderColor = null; - disabledBorderColor = null; disabledBackground = null; disabledForeground = null; focusedBackground = null; buttonBackground = null; + buttonSeparatorColor = null; + buttonDisabledSeparatorColor = null; buttonArrowColor = null; buttonDisabledArrowColor = null; buttonHoverArrowColor = null; @@ -394,10 +394,13 @@ public class FlatSpinnerUI } // paint vertical line between value and arrow buttons - g2.setColor( enabled ? borderColor : disabledBorderColor ); - float lw = scale( 1f ); - float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw; - g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2) ) ); + Color separatorColor = enabled ? buttonSeparatorColor : buttonDisabledSeparatorColor; + if( separatorColor != null ) { + g2.setColor( separatorColor ); + float lw = scale( 1f ); + float lx = isLeftToRight ? arrowX : arrowX + arrowWidth - lw; + g2.fill( new Rectangle2D.Float( lx, focusWidth, lw, height - 1 - (focusWidth * 2) ) ); + } } paint( g, c ); diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties index b57cd232..129f2194 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLaf.properties @@ -214,6 +214,8 @@ ComboBox.maximumRowCount = 15 ComboBox.buttonStyle = auto ComboBox.background = @textComponentBackground ComboBox.buttonBackground = @textComponentBackground +ComboBox.buttonSeparatorColor = $Component.borderColor +ComboBox.buttonDisabledSeparatorColor = $Component.disabledBorderColor ComboBox.buttonArrowColor = @buttonArrowColor ComboBox.buttonDisabledArrowColor = @buttonDisabledArrowColor ComboBox.buttonHoverArrowColor = @buttonHoverArrowColor @@ -547,6 +549,8 @@ Slider.focusWidth = 4 Spinner.border = com.formdev.flatlaf.ui.FlatRoundBorder Spinner.background = @textComponentBackground Spinner.buttonBackground = $ComboBox.buttonEditableBackground +Spinner.buttonSeparatorColor = $Component.borderColor +Spinner.buttonDisabledSeparatorColor = $Component.disabledBorderColor Spinner.buttonArrowColor = @buttonArrowColor Spinner.buttonDisabledArrowColor = @buttonDisabledArrowColor Spinner.buttonHoverArrowColor = @buttonHoverArrowColor diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java index a37e7914..0189b184 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyleableInfo.java @@ -151,8 +151,6 @@ public class TestFlatStyleableInfo "editorColumns", int.class, "buttonStyle", String.class, "arrowType", String.class, - "borderColor", Color.class, - "disabledBorderColor", Color.class, "editableBackground", Color.class, "focusedBackground", Color.class, @@ -162,6 +160,8 @@ public class TestFlatStyleableInfo "buttonBackground", Color.class, "buttonFocusedBackground", Color.class, "buttonEditableBackground", Color.class, + "buttonSeparatorColor", Color.class, + "buttonDisabledSeparatorColor", Color.class, "buttonArrowColor", Color.class, "buttonDisabledArrowColor", Color.class, "buttonHoverArrowColor", Color.class, @@ -598,12 +598,12 @@ public class TestFlatStyleableInfo "minimumWidth", int.class, "buttonStyle", String.class, "arrowType", String.class, - "borderColor", Color.class, - "disabledBorderColor", Color.class, "disabledBackground", Color.class, "disabledForeground", Color.class, "focusedBackground", Color.class, "buttonBackground", Color.class, + "buttonSeparatorColor", Color.class, + "buttonDisabledSeparatorColor", Color.class, "buttonArrowColor", Color.class, "buttonDisabledArrowColor", Color.class, "buttonHoverArrowColor", Color.class, diff --git a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java index 8325478a..5b2993e1 100644 --- a/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java +++ b/flatlaf-core/src/test/java/com/formdev/flatlaf/ui/TestFlatStyling.java @@ -236,8 +236,6 @@ public class TestFlatStyling ui.applyStyle( "editorColumns: 10" ); ui.applyStyle( "buttonStyle: auto" ); ui.applyStyle( "arrowType: chevron" ); - ui.applyStyle( "borderColor: #fff" ); - ui.applyStyle( "disabledBorderColor: #fff" ); ui.applyStyle( "editableBackground: #fff" ); ui.applyStyle( "focusedBackground: #fff" ); @@ -247,6 +245,8 @@ public class TestFlatStyling ui.applyStyle( "buttonBackground: #fff" ); ui.applyStyle( "buttonFocusedBackground: #fff" ); ui.applyStyle( "buttonEditableBackground: #fff" ); + ui.applyStyle( "buttonSeparatorColor: #fff" ); + ui.applyStyle( "buttonDisabledSeparatorColor: #fff" ); ui.applyStyle( "buttonArrowColor: #fff" ); ui.applyStyle( "buttonDisabledArrowColor: #fff" ); ui.applyStyle( "buttonHoverArrowColor: #fff" ); @@ -702,12 +702,12 @@ public class TestFlatStyling ui.applyStyle( "minimumWidth: 100" ); ui.applyStyle( "buttonStyle: button" ); ui.applyStyle( "arrowType: chevron" ); - ui.applyStyle( "borderColor: #fff" ); - ui.applyStyle( "disabledBorderColor: #fff" ); ui.applyStyle( "disabledBackground: #fff" ); ui.applyStyle( "disabledForeground: #fff" ); ui.applyStyle( "focusedBackground: #fff" ); ui.applyStyle( "buttonBackground: #fff" ); + ui.applyStyle( "buttonSeparatorColor: #fff" ); + ui.applyStyle( "buttonDisabledSeparatorColor: #fff" ); ui.applyStyle( "buttonArrowColor: #fff" ); ui.applyStyle( "buttonDisabledArrowColor: #fff" ); ui.applyStyle( "buttonHoverArrowColor: #fff" ); diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt index 88a46b69..1f66ba0e 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -192,10 +192,12 @@ ComboBox.buttonArrowColor #9a9da1 HSL 214 4 62 javax.swing.plaf.Colo ComboBox.buttonBackground #45494a HSL 192 3 28 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDarkShadow #7e7e7e HSL 0 0 49 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDisabledArrowColor #5a5d61 HSL 214 4 37 javax.swing.plaf.ColorUIResource [UI] +ComboBox.buttonDisabledSeparatorColor #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonEditableBackground #404445 HSL 192 4 26 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHighlight #242424 HSL 0 0 14 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHoverArrowColor #b4b7ba HSL 210 4 72 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%) ComboBox.buttonPressedArrowColor #cfd0d2 HSL 220 3 82 com.formdev.flatlaf.util.DerivedColor [UI] lighten(20%) +ComboBox.buttonSeparatorColor #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonShadow #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonStyle auto ComboBox.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] @@ -950,8 +952,10 @@ Spinner.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F Spinner.buttonArrowColor #9a9da1 HSL 214 4 62 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonBackground #404445 HSL 192 4 26 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonDisabledArrowColor #5a5d61 HSL 214 4 37 javax.swing.plaf.ColorUIResource [UI] +Spinner.buttonDisabledSeparatorColor #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonHoverArrowColor #b4b7ba HSL 210 4 72 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%) Spinner.buttonPressedArrowColor #cfd0d2 HSL 220 3 82 com.formdev.flatlaf.util.DerivedColor [UI] lighten(20%) +Spinner.buttonSeparatorColor #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonStyle button Spinner.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] Spinner.disabledForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt index 97e4ea1c..2e6a7c62 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -196,10 +196,12 @@ ComboBox.buttonArrowColor #666666 HSL 0 0 40 javax.swing.plaf.Colo ComboBox.buttonBackground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDarkShadow #9e9e9e HSL 0 0 62 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDisabledArrowColor #a6a6a6 HSL 0 0 65 javax.swing.plaf.ColorUIResource [UI] +ComboBox.buttonDisabledSeparatorColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonEditableBackground #fafafa HSL 0 0 98 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHighlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHoverArrowColor #999999 HSL 0 0 60 com.formdev.flatlaf.util.DerivedColor [UI] lighten(20%) ComboBox.buttonPressedArrowColor #b3b3b3 HSL 0 0 70 com.formdev.flatlaf.util.DerivedColor [UI] lighten(30%) +ComboBox.buttonSeparatorColor #c4c4c4 HSL 0 0 77 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonShadow #c4c4c4 HSL 0 0 77 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonStyle auto ComboBox.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] @@ -955,8 +957,10 @@ Spinner.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F Spinner.buttonArrowColor #666666 HSL 0 0 40 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonBackground #fafafa HSL 0 0 98 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonDisabledArrowColor #a6a6a6 HSL 0 0 65 javax.swing.plaf.ColorUIResource [UI] +Spinner.buttonDisabledSeparatorColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonHoverArrowColor #999999 HSL 0 0 60 com.formdev.flatlaf.util.DerivedColor [UI] lighten(20%) Spinner.buttonPressedArrowColor #b3b3b3 HSL 0 0 70 com.formdev.flatlaf.util.DerivedColor [UI] lighten(30%) +Spinner.buttonSeparatorColor #c4c4c4 HSL 0 0 77 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonStyle button Spinner.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] Spinner.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt index 57d85293..fbf232cb 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0_202.txt @@ -193,11 +193,13 @@ ComboBox.buttonArrowColor #666666 HSL 0 0 40 javax.swing.plaf.Colo ComboBox.buttonBackground #f0f0f0 HSL 0 0 94 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDarkShadow #696969 HSL 0 0 41 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonDisabledArrowColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] +ComboBox.buttonDisabledSeparatorColor #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonEditableBackground #cccccc HSL 0 0 80 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonFocusedBackground #ffff00 HSL 60 100 50 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHighlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonHoverArrowColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonPressedArrowColor #0000ff HSL 240 100 50 javax.swing.plaf.ColorUIResource [UI] +ComboBox.buttonSeparatorColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonShadow #a0a0a0 HSL 0 0 63 javax.swing.plaf.ColorUIResource [UI] ComboBox.buttonStyle auto ComboBox.disabledBackground #e0e0e0 HSL 0 0 88 javax.swing.plaf.ColorUIResource [UI] @@ -955,8 +957,10 @@ Spinner.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.F Spinner.buttonArrowColor #666666 HSL 0 0 40 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonBackground #cccccc HSL 0 0 80 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonDisabledArrowColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] +Spinner.buttonDisabledSeparatorColor #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonHoverArrowColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonPressedArrowColor #0000ff HSL 240 100 50 javax.swing.plaf.ColorUIResource [UI] +Spinner.buttonSeparatorColor #ff0000 HSL 0 100 50 javax.swing.plaf.ColorUIResource [UI] Spinner.buttonStyle button Spinner.disabledBackground #e0e0e0 HSL 0 0 88 javax.swing.plaf.ColorUIResource [UI] Spinner.disabledForeground #000088 HSL 240 100 27 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt index 4b203a4b..de016433 100644 --- a/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt +++ b/flatlaf-theme-editor/src/main/resources/com/formdev/flatlaf/themeeditor/FlatLafUIKeys.txt @@ -149,11 +149,13 @@ ComboBox.buttonArrowColor ComboBox.buttonBackground ComboBox.buttonDarkShadow ComboBox.buttonDisabledArrowColor +ComboBox.buttonDisabledSeparatorColor ComboBox.buttonEditableBackground ComboBox.buttonFocusedBackground ComboBox.buttonHighlight ComboBox.buttonHoverArrowColor ComboBox.buttonPressedArrowColor +ComboBox.buttonSeparatorColor ComboBox.buttonShadow ComboBox.buttonStyle ComboBox.disabledBackground @@ -713,8 +715,10 @@ Spinner.border Spinner.buttonArrowColor Spinner.buttonBackground Spinner.buttonDisabledArrowColor +Spinner.buttonDisabledSeparatorColor Spinner.buttonHoverArrowColor Spinner.buttonPressedArrowColor +Spinner.buttonSeparatorColor Spinner.buttonStyle Spinner.disabledBackground Spinner.disabledForeground