diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java index b2e5514a..0472d3d4 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/UIDefaultsLoader.java @@ -558,7 +558,7 @@ class UIDefaultsLoader } /** - * Syntax: lighten([color,]amount[,options]) or darken([color,]amount[,options]) + * Syntax: lighten(color,amount[,options]) or darken(color,amount[,options]) * - color: a color (e.g. #f00) or a color function * - amount: percentage 0-100% * - options: [relative] [autoInverse] [lazy] [derived] @@ -566,17 +566,15 @@ class UIDefaultsLoader private static Object parseColorLightenOrDarken( boolean lighten, List params, Function resolver, boolean reportError ) { - boolean isDerived = params.get( 0 ).endsWith( "%" ); - String colorStr = isDerived ? null : params.get( 0 ); - int nextParam = isDerived ? 0 : 1; - int amount = parsePercentage( params.get( nextParam++ ) ); + String colorStr = params.get( 0 ); + int amount = parsePercentage( params.get( 1 ) ); boolean relative = false; boolean autoInverse = false; boolean lazy = false; boolean derived = false; - if( params.size() > nextParam ) { - String options = params.get( nextParam++ ); + if( params.size() > 2 ) { + String options = params.get( 2 ); relative = options.contains( "relative" ); autoInverse = options.contains( "autoInverse" ); lazy = options.contains( "lazy" ); @@ -587,9 +585,6 @@ class UIDefaultsLoader ? new ColorFunctions.Lighten( amount, relative, autoInverse ) : new ColorFunctions.Darken( amount, relative, autoInverse ); - if( isDerived ) - return new DerivedColor( null, function ); - if( derived ) { ColorUIResource color = (ColorUIResource) parseColorOrFunction( resolver.apply( colorStr ), resolver, reportError ); return new DerivedColor( ColorFunctions.applyFunctions( color, function ), function ); 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 28443694..8eba2199 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -32,10 +32,6 @@ @cellFocusColor=#000000 @icon=#adadad -# Button -@buttonHoverBackground=lighten(3%,autoInverse) -@buttonPressedBackground=lighten(6%,autoInverse) - # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors) @dropCellBackground=darken(List.selectionBackground,10%,lazy) @dropCellForeground=lazy(List.selectionForeground) @@ -73,8 +69,8 @@ controlDkShadow=lighten($controlShadow,10%) #---- Button ---- Button.background=#4c5052 -Button.hoverBackground=@buttonHoverBackground -Button.pressedBackground=@buttonPressedBackground +Button.hoverBackground=lighten($Button.background,3%,derived autoInverse) +Button.pressedBackground=lighten($Button.background,6%,derived autoInverse) Button.borderColor=#5e6060 Button.disabledBorderColor=#5e6060 @@ -83,8 +79,8 @@ Button.hoverBorderColor=$Button.focusedBorderColor Button.default.background=#365880 Button.default.foreground=#bbbbbb -Button.default.hoverBackground=@buttonHoverBackground -Button.default.pressedBackground=@buttonPressedBackground +Button.default.hoverBackground=lighten($Button.default.background,3%,derived autoInverse) +Button.default.pressedBackground=lighten($Button.default.background,6%,derived autoInverse) Button.default.borderColor=#4c708c Button.default.hoverBorderColor=#537699 Button.default.focusedBorderColor=#537699 @@ -105,8 +101,8 @@ CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor CheckBox.icon.selectedFocusedBorderColor=#466D94 CheckBox.icon.background=#43494A CheckBox.icon.disabledBackground=@background -CheckBox.icon.hoverBackground=@buttonHoverBackground -CheckBox.icon.pressedBackground=@buttonPressedBackground +CheckBox.icon.hoverBackground=lighten($CheckBox.icon.background,3%,derived autoInverse) +CheckBox.icon.pressedBackground=lighten($CheckBox.icon.background,6%,derived autoInverse) CheckBox.icon.selectedBackground=#43494A CheckBox.icon.checkmarkColor=#A7A7A7 CheckBox.icon.disabledCheckmarkColor=#606060 @@ -151,8 +147,8 @@ InternalFrame.inactiveTitleForeground=@disabledText InternalFrame.activeBorderColor=lighten($Component.borderColor,10%) InternalFrame.inactiveBorderColor=$Component.borderColor -InternalFrame.buttonHoverBackground=lighten(10%,autoInverse) -InternalFrame.buttonPressedBackground=lighten(20%,autoInverse) +InternalFrame.buttonHoverBackground=lighten($InternalFrame.activeTitleBackground,10%,derived autoInverse) +InternalFrame.buttonPressedBackground=lighten($InternalFrame.activeTitleBackground,20%,derived autoInverse) InternalFrame.closeHoverBackground=lazy(Actions.Red) InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy) InternalFrame.closeHoverForeground=#fff @@ -218,7 +214,7 @@ Separator.foreground=#515151 Slider.trackColor=#646464 Slider.thumbColor=#A6A6A6 Slider.tickColor=#888888 -Slider.hoverColor=darken(15%,autoInverse) +Slider.hoverColor=darken($Slider.thumbColor,15%,derived autoInverse) Slider.disabledForeground=#4c5052 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 ee3714d5..796b1c27 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -32,10 +32,6 @@ @cellFocusColor=#000000 @icon=#afafaf -# Button -@buttonHoverBackground=darken(3%,autoInverse) -@buttonPressedBackground=darken(10%,autoInverse) - # Drop (use lazy colors for IntelliJ platform themes, which usually do not specify these colors) @dropCellBackground=lighten(List.selectionBackground,10%,lazy) @dropCellForeground=lazy(List.selectionForeground) @@ -74,8 +70,8 @@ controlDkShadow=darken($controlShadow,15%) Button.background=#ffffff Button.focusedBackground=#e3f1fa -Button.hoverBackground=@buttonHoverBackground -Button.pressedBackground=@buttonPressedBackground +Button.hoverBackground=darken($Button.background,3%,derived autoInverse) +Button.pressedBackground=darken($Button.background,10%,derived autoInverse) Button.borderColor=$Component.borderColor Button.disabledBorderColor=$Component.disabledBorderColor @@ -85,8 +81,8 @@ Button.hoverBorderColor=$Button.focusedBorderColor Button.default.background=$Button.background Button.default.foreground=@foreground Button.default.focusedBackground=$Button.focusedBackground -Button.default.hoverBackground=@buttonHoverBackground -Button.default.pressedBackground=@buttonPressedBackground +Button.default.hoverBackground=$Button.hoverBackground +Button.default.pressedBackground=$Button.pressedBackground Button.default.borderColor=#4F9EE3 Button.default.hoverBorderColor=$Button.hoverBorderColor Button.default.focusedBorderColor=$Button.focusedBorderColor @@ -107,8 +103,8 @@ CheckBox.icon.hoverBorderColor=$CheckBox.icon.focusedBorderColor CheckBox.icon.background=#FFFFFF CheckBox.icon.disabledBackground=@background CheckBox.icon.focusedBackground=$Button.focusedBackground -CheckBox.icon.hoverBackground=@buttonHoverBackground -CheckBox.icon.pressedBackground=@buttonPressedBackground +CheckBox.icon.hoverBackground=$Button.hoverBackground +CheckBox.icon.pressedBackground=$Button.pressedBackground CheckBox.icon.selectedBackground=#FFFFFF CheckBox.icon.checkmarkColor=#4F9EE3 CheckBox.icon.disabledCheckmarkColor=#ABABAB @@ -158,8 +154,8 @@ InternalFrame.inactiveTitleForeground=@disabledText InternalFrame.activeBorderColor=darken($Component.borderColor,20%) InternalFrame.inactiveBorderColor=$Component.borderColor -InternalFrame.buttonHoverBackground=darken(10%,autoInverse) -InternalFrame.buttonPressedBackground=darken(20%,autoInverse) +InternalFrame.buttonHoverBackground=darken($InternalFrame.activeTitleBackground,10%,derived autoInverse) +InternalFrame.buttonPressedBackground=darken($InternalFrame.activeTitleBackground,20%,derived autoInverse) InternalFrame.closeHoverBackground=lazy(Actions.Red) InternalFrame.closePressedBackground=darken(Actions.Red,10%,lazy) InternalFrame.closeHoverForeground=#fff @@ -225,7 +221,7 @@ Separator.foreground=#d1d1d1 Slider.trackColor=#c4c4c4 Slider.thumbColor=#6e6e6e Slider.tickColor=#888888 -Slider.hoverColor=lighten(15%,autoInverse) +Slider.hoverColor=lighten($Slider.thumbColor,15%,derived autoInverse) Slider.disabledForeground=#c0c0c0 diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt index 16651f1a..5f51b85a 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202-mac.txt @@ -73,9 +73,9 @@ Button.default.borderWidth 1 Button.default.focusColor #43688c javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBorderColor #537699 javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Button.default.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.hoverBackground #3b5f8b com.formdev.flatlaf.util.DerivedColor [UI] Button.default.hoverBorderColor #537699 javax.swing.plaf.ColorUIResource [UI] -Button.default.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.pressedBackground #3f6796 com.formdev.flatlaf.util.DerivedColor [UI] Button.defaultButtonFollowsFocus false Button.disabledBorderColor #5e6060 javax.swing.plaf.ColorUIResource [UI] Button.disabledText #777777 javax.swing.plaf.ColorUIResource [UI] @@ -83,13 +83,13 @@ Button.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Button.highlight #242424 javax.swing.plaf.ColorUIResource [UI] -Button.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.hoverBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI] Button.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.light #313131 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.pressedBackground #5b5f62 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #646464 javax.swing.plaf.ColorUIResource [UI] Button.textIconGap 4 @@ -121,9 +121,9 @@ CheckBox.icon.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI CheckBox.icon.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #606060 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.pressedBackground #52595a com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.selectedBackground #43494a javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #6b6b6b javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedFocusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] @@ -309,10 +309,10 @@ HelpButton.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #606060 javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -HelpButton.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] -HelpButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.pressedBackground #52595a com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.questionMarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI] @@ -337,8 +337,8 @@ InternalFrame.borderLight #313131 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderLineWidth 1 InternalFrame.borderMargins 6,6,6,6 javax.swing.plaf.InsetsUIResource [UI] InternalFrame.borderShadow #646464 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] -InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonHoverBackground #3d3f40 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonPressedBackground #56585a com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] InternalFrame.closeHoverBackground [lazy] #c75450 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -779,7 +779,7 @@ Slider.font [active] $defaultFont [UI] Slider.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Slider.highlight #242424 javax.swing.plaf.ColorUIResource [UI] Slider.horizontalSize 200,21 java.awt.Dimension -Slider.hoverColor #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Slider.hoverColor #808080 com.formdev.flatlaf.util.DerivedColor [UI] Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true @@ -1026,7 +1026,7 @@ ToggleButton.highlight #242424 javax.swing.plaf.ColorUIResource [UI] ToggleButton.iconTextGap 4 ToggleButton.light #313131 javax.swing.plaf.ColorUIResource [UI] ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] -ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +ToggleButton.pressedBackground #5b5f62 com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.rollover true ToggleButton.selectedBackground #656a6c com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.selectedForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt index 2b5b4bb2..297b0e0e 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -73,9 +73,9 @@ Button.default.borderWidth 1 Button.default.focusColor #43688c javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBorderColor #537699 javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] -Button.default.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.hoverBackground #3b5f8b com.formdev.flatlaf.util.DerivedColor [UI] Button.default.hoverBorderColor #537699 javax.swing.plaf.ColorUIResource [UI] -Button.default.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.pressedBackground #3f6796 com.formdev.flatlaf.util.DerivedColor [UI] Button.defaultButtonFollowsFocus true Button.disabledBorderColor #5e6060 javax.swing.plaf.ColorUIResource [UI] Button.disabledText #777777 javax.swing.plaf.ColorUIResource [UI] @@ -83,13 +83,13 @@ Button.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Button.highlight #242424 javax.swing.plaf.ColorUIResource [UI] -Button.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.hoverBackground #53585a com.formdev.flatlaf.util.DerivedColor [UI] Button.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.light #313131 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.pressedBackground #5b5f62 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #646464 javax.swing.plaf.ColorUIResource [UI] Button.textIconGap 4 @@ -121,9 +121,9 @@ CheckBox.icon.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI CheckBox.icon.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #606060 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.pressedBackground #52595a com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.selectedBackground #43494a javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #6b6b6b javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedFocusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] @@ -308,10 +308,10 @@ HelpButton.disabledBackground #3c3f41 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledBorderColor #545556 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #606060 javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] -HelpButton.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.hoverBackground #4a5152 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.hoverBorderColor #466d94 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] -HelpButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.pressedBackground #52595a com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.questionMarkColor #a7a7a7 javax.swing.plaf.ColorUIResource [UI] @@ -336,8 +336,8 @@ InternalFrame.borderLight #313131 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderLineWidth 1 InternalFrame.borderMargins 6,6,6,6 javax.swing.plaf.InsetsUIResource [UI] InternalFrame.borderShadow #646464 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] -InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonHoverBackground #3d3f40 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonPressedBackground #56585a com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] InternalFrame.closeHoverBackground [lazy] #c75450 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -777,7 +777,7 @@ Slider.font [active] $defaultFont [UI] Slider.foreground #bbbbbb javax.swing.plaf.ColorUIResource [UI] Slider.highlight #242424 javax.swing.plaf.ColorUIResource [UI] Slider.horizontalSize 200,21 java.awt.Dimension -Slider.hoverColor #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Slider.hoverColor #808080 com.formdev.flatlaf.util.DerivedColor [UI] Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true @@ -1024,7 +1024,7 @@ ToggleButton.highlight #242424 javax.swing.plaf.ColorUIResource [UI] ToggleButton.iconTextGap 4 ToggleButton.light #313131 javax.swing.plaf.ColorUIResource [UI] ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] -ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +ToggleButton.pressedBackground #5b5f62 com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.rollover true ToggleButton.selectedBackground #656a6c com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.selectedForeground #bbbbbb javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt index 2c9539da..bac5ba54 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202-mac.txt @@ -73,9 +73,9 @@ Button.default.focusColor #97c3f3 javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -Button.default.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] -Button.default.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] Button.defaultButtonFollowsFocus false Button.disabledBorderColor #cfcfcf javax.swing.plaf.ColorUIResource [UI] Button.disabledText #8c8c8c javax.swing.plaf.ColorUIResource [UI] @@ -84,13 +84,13 @@ Button.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Button.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] -Button.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] Button.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] Button.textIconGap 4 @@ -123,9 +123,9 @@ CheckBox.icon.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [U CheckBox.icon.disabledCheckmarkColor #ababab javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.hoverBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.selectedBackground #ffffff javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI] @@ -311,10 +311,10 @@ HelpButton.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #ababab javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -HelpButton.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.hoverBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] -HelpButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.questionMarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI] @@ -339,8 +339,8 @@ InternalFrame.borderLight #e3e3e3 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderLineWidth 1 InternalFrame.borderMargins 6,6,6,6 javax.swing.plaf.InsetsUIResource [UI] InternalFrame.borderShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] -InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonHoverBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonPressedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] InternalFrame.closeHoverBackground [lazy] #db5860 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -781,7 +781,7 @@ Slider.font [active] $defaultFont [UI] Slider.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Slider.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] Slider.horizontalSize 200,21 java.awt.Dimension -Slider.hoverColor #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Slider.hoverColor #949494 com.formdev.flatlaf.util.DerivedColor [UI] Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true @@ -1028,7 +1028,7 @@ ToggleButton.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] ToggleButton.iconTextGap 4 ToggleButton.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] -ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +ToggleButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.rollover true ToggleButton.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.selectedForeground #000000 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt index 8e25985d..4d98bec9 100644 --- a/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/src/main/resources/com/formdev/flatlaf/testing/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -73,9 +73,9 @@ Button.default.focusColor #97c3f3 javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] Button.default.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #000000 javax.swing.plaf.ColorUIResource [UI] -Button.default.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] Button.default.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] -Button.default.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.default.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] Button.defaultButtonFollowsFocus true Button.disabledBorderColor #cfcfcf javax.swing.plaf.ColorUIResource [UI] Button.disabledText #8c8c8c javax.swing.plaf.ColorUIResource [UI] @@ -84,13 +84,13 @@ Button.focusedBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Button.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] -Button.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] Button.hoverBorderColor #87afda javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] Button.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] Button.minimumWidth 72 -Button.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Button.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] Button.rollover true Button.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] Button.textIconGap 4 @@ -123,9 +123,9 @@ CheckBox.icon.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [U CheckBox.icon.disabledCheckmarkColor #ababab javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.hoverBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +CheckBox.icon.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] CheckBox.icon.selectedBackground #ffffff javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #b0b0b0 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatCheckBoxIcon [UI] @@ -310,10 +310,10 @@ HelpButton.disabledBorderColor #bdbdbd javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #ababab javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBackground #e3f1fa javax.swing.plaf.ColorUIResource [UI] HelpButton.focusedBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] -HelpButton.hoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.hoverBackground #f7f7f7 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.hoverBorderColor #7b9fc7 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] -HelpButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +HelpButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] HelpButton.questionMarkColor #4f9ee3 javax.swing.plaf.ColorUIResource [UI] @@ -338,8 +338,8 @@ InternalFrame.borderLight #e3e3e3 javax.swing.plaf.ColorUIResource [UI] InternalFrame.borderLineWidth 1 InternalFrame.borderMargins 6,6,6,6 javax.swing.plaf.InsetsUIResource [UI] InternalFrame.borderShadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] -InternalFrame.buttonHoverBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] -InternalFrame.buttonPressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonHoverBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] +InternalFrame.buttonPressedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI] InternalFrame.buttonSize 24,24 javax.swing.plaf.DimensionUIResource [UI] InternalFrame.closeHoverBackground [lazy] #db5860 javax.swing.plaf.ColorUIResource [UI] InternalFrame.closeHoverForeground #ffffff javax.swing.plaf.ColorUIResource [UI] @@ -779,7 +779,7 @@ Slider.font [active] $defaultFont [UI] Slider.foreground #000000 javax.swing.plaf.ColorUIResource [UI] Slider.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] Slider.horizontalSize 200,21 java.awt.Dimension -Slider.hoverColor #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +Slider.hoverColor #949494 com.formdev.flatlaf.util.DerivedColor [UI] Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true @@ -1026,7 +1026,7 @@ ToggleButton.highlight #ffffff javax.swing.plaf.ColorUIResource [UI] ToggleButton.iconTextGap 4 ToggleButton.light #e3e3e3 javax.swing.plaf.ColorUIResource [UI] ToggleButton.margin 2,14,2,14 javax.swing.plaf.InsetsUIResource [UI] -ToggleButton.pressedBackground #ff0000 com.formdev.flatlaf.util.DerivedColor [UI] +ToggleButton.pressedBackground #e6e6e6 com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.rollover true ToggleButton.selectedBackground #cccccc com.formdev.flatlaf.util.DerivedColor [UI] ToggleButton.selectedForeground #000000 javax.swing.plaf.ColorUIResource [UI]