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 3dcd9fd5..edd17490 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -36,7 +36,7 @@ @foreground = #bbb @selectionBackground = #4B6EAF @selectionForeground = @foreground -@selectionInactiveBackground = #0D293E +@selectionInactiveBackground =spin(saturate(shade(@selectionBackground,70%),20%),-15) @selectionInactiveForeground = @foreground @disabledText = #888 @textComponentBackground = #45494A @@ -79,7 +79,7 @@ Button.selectedBackground = lighten($Button.background,10%,derived) Button.selectedForeground = @foreground Button.disabledSelectedBackground = lighten($Button.background,3%,derived) -Button.borderColor = #5e6060 +Button.borderColor = tint($Button.background,10%) Button.disabledBorderColor = $Button.borderColor Button.focusedBorderColor = $Component.focusedBorderColor Button.hoverBorderColor = $Button.focusedBorderColor @@ -87,13 +87,13 @@ Button.hoverBorderColor = $Button.focusedBorderColor Button.innerFocusWidth = 1 Button.default.background = #365880 -Button.default.foreground = #bbb +Button.default.foreground = @foreground Button.default.hoverBackground = lighten($Button.default.background,3%,derived) Button.default.pressedBackground = lighten($Button.default.background,6%,derived) -Button.default.borderColor = #4c708c -Button.default.hoverBorderColor = #537699 -Button.default.focusedBorderColor = #537699 -Button.default.focusColor = #43688c +Button.default.borderColor = tint($Button.default.background,15%) +Button.default.hoverBorderColor = tint($Button.default.background,18%) +Button.default.focusedBorderColor = $Button.default.hoverBorderColor +Button.default.focusColor = lighten($Component.focusColor,3%) Button.default.boldText = true Button.toolbar.hoverBackground = lighten($Button.background,1%,derived) @@ -116,7 +116,7 @@ CheckBox.icon.disabledBackground = @background CheckBox.icon.disabledCheckmarkColor = #606060 # focused -CheckBox.icon.focusedBorderColor = #466D94 +CheckBox.icon.focusedBorderColor = $Component.focusedBorderColor CheckBox.icon.focusedBackground = fade($CheckBox.icon.focusedBorderColor,30%) # hover @@ -146,8 +146,8 @@ ComboBox.buttonEditableBackground = darken($ComboBox.background,2%) #---- Component ---- Component.borderColor = #646464 -Component.disabledBorderColor = #646464 -Component.focusedBorderColor = #466d94 +Component.disabledBorderColor = $Component.borderColor +Component.focusedBorderColor = lighten($Component.focusColor,5%) Component.focusColor = #3d6185 Component.linkColor = #589df6 Component.grayFilter = -20,-70,100 @@ -276,7 +276,7 @@ SplitPaneDivider.draggingColor = #646464 TabbedPane.underlineColor = #4A88C7 TabbedPane.disabledUnderlineColor = #7a7a7a TabbedPane.hoverColor = darken($TabbedPane.background,5%,derived noAutoInverse) -TabbedPane.focusColor = #3d4b5c +TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,25%) TabbedPane.contentAreaColor = #646464 TabbedPane.buttonHoverBackground = darken($TabbedPane.background,5%,derived noAutoInverse) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties index 550459f4..e3cd5d67 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatIntelliJLaf.properties @@ -38,10 +38,9 @@ Button.focusedBackground = null Button.default.background = #4D8AC9 Button.default.foreground = #fff Button.default.focusedBackground = null -Button.default.borderColor = #3D75B2 -Button.default.hoverBorderColor = #A9C9F5 -Button.default.focusedBorderColor = #A9C9F5 -Button.default.focusColor = #97c3f3 +Button.default.borderColor = shade($Button.default.background,15%) +Button.default.hoverBorderColor = tint($Button.default.background,50%) +Button.default.focusedBorderColor = $Button.default.hoverBorderColor Button.default.boldText = true Button.default.borderWidth = 1 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 d7fbce53..fa21ede5 100644 --- 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,7 @@ controlDkShadow = darken($controlShadow,15%) #---- Button ---- Button.background = #fff -Button.focusedBackground = #e3f1fa +Button.focusedBackground = changeLightness(@selectionBackground,95%) Button.hoverBackground = darken($Button.background,3%,derived) Button.pressedBackground = darken($Button.background,10%,derived) Button.selectedBackground = darken($Button.background,20%,derived) @@ -118,7 +118,7 @@ CheckBox.icon.disabledBackground = @background CheckBox.icon.disabledCheckmarkColor = #ABABAB # focused -CheckBox.icon.focusedBorderColor = #7B9FC7 +CheckBox.icon.focusedBorderColor = shade($Component.focusedBorderColor,10%) CheckBox.icon.focusedBackground = $Button.focusedBackground # hover @@ -131,11 +131,11 @@ CheckBox.icon.pressedBackground = $Button.pressedBackground # used if CheckBox.icon.style = filled # enabled -CheckBox.icon[filled].selectedBorderColor = #4B97D9 +CheckBox.icon[filled].selectedBorderColor = shade($CheckBox.icon[filled].selectedBackground,5%) CheckBox.icon[filled].selectedBackground = #4F9EE3 CheckBox.icon[filled].checkmarkColor = #fff # focused -CheckBox.icon[filled].selectedFocusedBorderColor = #ACCFF7 +CheckBox.icon[filled].selectedFocusedBorderColor = tint($CheckBox.icon[filled].selectedBackground,50%) CheckBox.icon[filled].selectedFocusedBackground = $CheckBox.icon[filled].selectedBackground CheckBox.icon[filled].selectedFocusedCheckmarkColor = $CheckBox.icon.focusedBackground # hover @@ -152,8 +152,8 @@ ComboBox.buttonEditableBackground = darken($ComboBox.background,2%) #---- Component ---- Component.borderColor = #c4c4c4 -Component.disabledBorderColor = #cfcfcf -Component.focusedBorderColor = #87afda +Component.disabledBorderColor = lighten($Component.borderColor,4%) +Component.focusedBorderColor = shade($Component.focusColor,10%) Component.focusColor = #97c3f3 Component.linkColor = #2470B3 Component.grayFilter = 25,-25,100 @@ -287,7 +287,7 @@ SplitPaneDivider.draggingColor = #c4c4c4 TabbedPane.underlineColor = #4083C9 TabbedPane.disabledUnderlineColor = #ababab TabbedPane.hoverColor = darken($TabbedPane.background,7%,derived) -TabbedPane.focusColor = #dae4ed +TabbedPane.focusColor = mix(@selectionBackground,$TabbedPane.background,10%) TabbedPane.contentAreaColor = #bfbfbf TabbedPane.buttonHoverBackground = darken($TabbedPane.background,7%,derived) diff --git a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties index 7ce6a467..6bd0de9d 100644 --- a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties +++ b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatDarkLaf.properties @@ -33,7 +33,7 @@ UIColorHighlighter.stripingBackground = lighten(@textComponentBackground,5%) #---- Hyperlink ---- -Hyperlink.linkColor = #589df6 +Hyperlink.linkColor = $Component.linkColor Hyperlink.visitedColor = $Hyperlink.linkColor Hyperlink.disabledText = @disabledText diff --git a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties index fd81dfc8..4aadeef9 100644 --- a/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties +++ b/flatlaf-swingx/src/main/resources/com/formdev/flatlaf/swingx/FlatLightLaf.properties @@ -46,7 +46,7 @@ JXMonthView.monthStringForeground = @foreground JXMonthView.daysOfTheWeekForeground = #444 JXMonthView.weekOfTheYearForeground = #666 JXMonthView.unselectableDayForeground = #E02222 -JXMonthView.selectedBackground = #B9CEF8 +JXMonthView.selectedBackground = changeLightness(@selectionBackground,85%) JXMonthView.flaggedDayForeground = #E02222 JXMonthView.leadingDayForeground = @disabledText JXMonthView.trailingDayForeground = @disabledText diff --git a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt index 90eae36a..c0020f29 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarculaLaf_1.8.0_202.txt @@ -18,7 +18,7 @@ #---- CheckBox ---- -- CheckBox.icon.focusedBackground #466d944d 30% HSLA 210 36 43 30 javax.swing.plaf.ColorUIResource [UI] +- CheckBox.icon.focusedBackground #456e964d 30% HSLA 210 37 43 30 javax.swing.plaf.ColorUIResource [UI] #---- ComboBox ---- 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 2f401fdc..f3b0d567 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -64,31 +64,31 @@ BusyLabelUI com.formdev.flatlaf.swingx.ui.FlatBusyLabelUI Button.arc 6 Button.background #4c5052 HSL 200 4 31 javax.swing.plaf.ColorUIResource [UI] Button.border [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatButtonBorder [UI] -Button.borderColor #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +Button.borderColor #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] Button.borderWidth 1 Button.darkShadow #7e7e7e HSL 0 0 49 javax.swing.plaf.ColorUIResource [UI] Button.default.background #365880 HSL 212 41 36 javax.swing.plaf.ColorUIResource [UI] Button.default.boldText true -Button.default.borderColor #4c708c HSL 206 30 42 javax.swing.plaf.ColorUIResource [UI] +Button.default.borderColor #547193 HSL 212 27 45 javax.swing.plaf.ColorUIResource [UI] Button.default.borderWidth 1 -Button.default.focusColor #43688c HSL 210 35 41 javax.swing.plaf.ColorUIResource [UI] -Button.default.focusedBorderColor #537699 HSL 210 30 46 javax.swing.plaf.ColorUIResource [UI] +Button.default.focusColor #42698f HSL 210 37 41 javax.swing.plaf.ColorUIResource [UI] +Button.default.focusedBorderColor #5a7697 HSL 212 25 47 javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] Button.default.hoverBackground #3b5f8b HSL 213 40 39 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) -Button.default.hoverBorderColor #537699 HSL 210 30 46 javax.swing.plaf.ColorUIResource [UI] +Button.default.hoverBorderColor #5a7697 HSL 212 25 47 javax.swing.plaf.ColorUIResource [UI] Button.default.pressedBackground #3f6796 HSL 212 41 42 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse) Button.defaultButtonFollowsFocus false Button.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] -Button.disabledBorderColor #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +Button.disabledBorderColor #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] Button.disabledForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] Button.disabledSelectedBackground #53585a HSL 197 4 34 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) Button.disabledText #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] -Button.focusedBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +Button.focusedBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] Button.highlight #242424 HSL 0 0 14 javax.swing.plaf.ColorUIResource [UI] Button.hoverBackground #53585a HSL 197 4 34 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) -Button.hoverBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +Button.hoverBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.innerFocusWidth 1 Button.light #313131 HSL 0 0 19 javax.swing.plaf.ColorUIResource [UI] @@ -128,10 +128,10 @@ CheckBox.icon.checkmarkColor #a7a7a7 HSL 0 0 65 javax.swing.plaf.Colo CheckBox.icon.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledBorderColor #545556 HSL 210 1 33 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #606060 HSL 0 0 38 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.focusedBackground #466d944d 30% HSLA 210 36 43 30 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.focusedBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusedBackground #456e964d 30% HSLA 210 37 43 30 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusedBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.hoverBackground #4a5152 HSL 188 5 31 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) -CheckBox.icon.hoverBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.hoverBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.pressedBackground #52595a HSL 188 5 34 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse) CheckBox.icon.selectedBackground #43494a HSL 189 5 28 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #6b6b6b HSL 0 0 42 javax.swing.plaf.ColorUIResource [UI] @@ -225,7 +225,7 @@ Component.error.borderColor #725555 HSL 0 15 39 javax.swing.plaf.Colo Component.error.focusedBorderColor #8b3c3c HSL 0 40 39 javax.swing.plaf.ColorUIResource [UI] Component.focusColor #3d6185 HSL 210 37 38 javax.swing.plaf.ColorUIResource [UI] Component.focusWidth 0 -Component.focusedBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +Component.focusedBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] Component.grayFilter [lazy] [unknown type] com.formdev.flatlaf.util.GrayFilter Component.hideMnemonics true Component.innerFocusWidth 0.5 @@ -333,9 +333,9 @@ HelpButton.borderWidth 1 HelpButton.disabledBackground #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledBorderColor #545556 HSL 210 1 33 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #606060 HSL 0 0 38 javax.swing.plaf.ColorUIResource [UI] -HelpButton.focusedBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +HelpButton.focusedBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] HelpButton.hoverBackground #4a5152 HSL 188 5 31 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) -HelpButton.hoverBorderColor #466d94 HSL 210 36 43 javax.swing.plaf.ColorUIResource [UI] +HelpButton.hoverBorderColor #456e96 HSL 210 37 43 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] HelpButton.innerFocusWidth 1 HelpButton.pressedBackground #52595a HSL 188 5 34 com.formdev.flatlaf.util.DerivedColor [UI] lighten(6% autoInverse) @@ -436,7 +436,7 @@ JXMonthView.weekOfTheYearForeground #888888 HSL 0 0 53 javax.swing.plaf #---- JXTitledPanel ---- -JXTitledPanel.borderColor #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +JXTitledPanel.borderColor #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] JXTitledPanel.captionInsets 4,10,4,10 javax.swing.plaf.InsetsUIResource [UI] JXTitledPanel.titleBackground #4c5052 HSL 200 4 31 javax.swing.plaf.ColorUIResource [UI] JXTitledPanel.titleForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] @@ -446,16 +446,16 @@ JXTitledPanel.titleForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.Colo JideButton.background #4c5052 HSL 200 4 31 javax.swing.plaf.ColorUIResource [UI] JideButton.border [lazy] 0,0,0,0 false com.formdev.flatlaf.ui.FlatMarginBorder [UI] -JideButton.borderColor #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] -JideButton.darkShadow #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +JideButton.borderColor #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] +JideButton.darkShadow #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] JideButton.focusedBackground #4e5355 HSL 197 4 32 com.formdev.flatlaf.util.DerivedColor [UI] lighten(1% autoInverse) JideButton.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] JideButton.highlight #656a6c HSL 197 3 41 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse) -JideButton.light #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +JideButton.light #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] JideButton.margin 3,3,3,3 javax.swing.plaf.InsetsUIResource [UI] JideButton.selectedAndFocusedBackground #565a5d HSL 206 4 35 com.formdev.flatlaf.util.DerivedColor [UI] lighten(4% autoInverse) JideButton.selectedBackground #5d6265 HSL 203 4 38 com.formdev.flatlaf.util.DerivedColor [UI] lighten(7% autoInverse) -JideButton.shadow #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +JideButton.shadow #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] JideButton.textIconGap [active] 4 JideButtonUI com.formdev.flatlaf.jideoss.ui.FlatJideButtonUI @@ -531,7 +531,7 @@ List.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.Colo List.noFocusBorder 1,1,1,1 false javax.swing.plaf.BorderUIResource$EmptyBorderUIResource [UI] List.selectionBackground #4b6eaf HSL 219 40 49 javax.swing.plaf.ColorUIResource [UI] List.selectionForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] -List.selectionInactiveBackground #0d293e HSL 206 65 15 javax.swing.plaf.ColorUIResource [UI] +List.selectionInactiveBackground #0f2a3d HSL 205 61 15 javax.swing.plaf.ColorUIResource [UI] List.selectionInactiveForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] List.showCellFocusIndicator false List.timeFactor 1000 @@ -1017,7 +1017,7 @@ TabbedPane.darkShadow #7e7e7e HSL 0 0 49 javax.swing.plaf.Colo TabbedPane.disabledForeground #888888 HSL 0 0 53 javax.swing.plaf.ColorUIResource [UI] TabbedPane.disabledUnderlineColor #7a7a7a HSL 0 0 48 javax.swing.plaf.ColorUIResource [UI] TabbedPane.focus #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.focusColor #3d4b5c HSL 213 20 30 javax.swing.plaf.ColorUIResource [UI] +TabbedPane.focusColor #404b5d HSL 217 18 31 javax.swing.plaf.ColorUIResource [UI] TabbedPane.font [active] $defaultFont [UI] TabbedPane.foreground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hasFullBorder false @@ -1075,7 +1075,7 @@ Table.rowHeight 20 Table.scrollPaneBorder [lazy] 1,1,1,1 false com.formdev.flatlaf.ui.FlatBorder [UI] Table.selectionBackground #4b6eaf HSL 219 40 49 javax.swing.plaf.ColorUIResource [UI] Table.selectionForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] -Table.selectionInactiveBackground #0d293e HSL 206 65 15 javax.swing.plaf.ColorUIResource [UI] +Table.selectionInactiveBackground #0f2a3d HSL 205 61 15 javax.swing.plaf.ColorUIResource [UI] Table.selectionInactiveForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] Table.showHorizontalLines false Table.showVerticalLines false @@ -1104,7 +1104,7 @@ TableUI com.formdev.flatlaf.ui.FlatTableUI #---- TaskPane ---- TaskPane.background #3c3f41 HSL 204 4 25 javax.swing.plaf.ColorUIResource [UI] -TaskPane.borderColor #5e6060 HSL 180 1 37 javax.swing.plaf.ColorUIResource [UI] +TaskPane.borderColor #5e6263 HSL 192 3 38 javax.swing.plaf.ColorUIResource [UI] TaskPane.contentInsets 10,10,10,10 javax.swing.plaf.InsetsUIResource [UI] TaskPane.specialTitleBackground #afafaf HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] TaskPane.specialTitleForeground #222222 HSL 0 0 13 javax.swing.plaf.ColorUIResource [UI] @@ -1246,7 +1246,7 @@ ToggleButton.selectedBackground #656a6c HSL 197 3 41 com.formdev.flatlaf. ToggleButton.selectedForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] ToggleButton.shadow #646464 HSL 0 0 39 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.disabledUnderlineColor #7a7a7a HSL 0 0 48 javax.swing.plaf.ColorUIResource [UI] -ToggleButton.tab.focusBackground #3d4b5c HSL 213 20 30 javax.swing.plaf.ColorUIResource [UI] +ToggleButton.tab.focusBackground #404b5d HSL 217 18 31 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.hoverBackground #303234 HSL 210 4 20 com.formdev.flatlaf.util.DerivedColor [UI] darken(5%) ToggleButton.tab.underlineColor #4a88c7 HSL 210 53 54 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.underlineHeight 2 @@ -1344,7 +1344,7 @@ Tree.scrollsOnExpand true Tree.selectionBackground #4b6eaf HSL 219 40 49 javax.swing.plaf.ColorUIResource [UI] Tree.selectionBorderColor #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Tree.selectionForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] -Tree.selectionInactiveBackground #0d293e HSL 206 65 15 javax.swing.plaf.ColorUIResource [UI] +Tree.selectionInactiveBackground #0f2a3d HSL 205 61 15 javax.swing.plaf.ColorUIResource [UI] Tree.selectionInactiveForeground #bbbbbb HSL 0 0 73 javax.swing.plaf.ColorUIResource [UI] Tree.showCellFocusIndicator false Tree.textBackground #45494a HSL 192 3 28 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt index 3b7d35be..e4358b5a 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatIntelliJLaf_1.8.0_202.txt @@ -18,15 +18,15 @@ + Button.default.boldText true - Button.default.borderColor #4f9ee3 HSL 208 73 60 javax.swing.plaf.ColorUIResource [UI] -+ Button.default.borderColor #3d75b2 HSL 211 49 47 javax.swing.plaf.ColorUIResource [UI] ++ Button.default.borderColor #4175ab HSL 211 45 46 javax.swing.plaf.ColorUIResource [UI] - Button.default.borderWidth 2 + Button.default.borderWidth 1 -- Button.default.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +- Button.default.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] -- Button.default.focusedBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] -+ Button.default.focusedBorderColor #a9c9f5 HSL 215 79 81 javax.swing.plaf.ColorUIResource [UI] +- Button.default.focusedBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] ++ Button.default.focusedBorderColor #a6c5e4 HSL 210 53 77 javax.swing.plaf.ColorUIResource [UI] - Button.default.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] + Button.default.foreground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] @@ -34,22 +34,22 @@ - Button.default.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) + Button.default.hoverBackground #4182c5 HSL 210 53 51 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) -- Button.default.hoverBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] -+ Button.default.hoverBorderColor #a9c9f5 HSL 215 79 81 javax.swing.plaf.ColorUIResource [UI] +- Button.default.hoverBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] ++ Button.default.hoverBorderColor #a6c5e4 HSL 210 53 77 javax.swing.plaf.ColorUIResource [UI] - Button.default.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) + Button.default.pressedBackground #3571ae HSL 210 53 45 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) -- Button.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +- Button.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] #---- CheckBox ---- -- CheckBox.icon.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +- CheckBox.icon.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] + CheckBox.icon.style filled -- CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +- CheckBox.icon[filled].selectedFocusedCheckmarkColor #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] #---- ComboBox ---- @@ -81,7 +81,7 @@ #---- HelpButton ---- -- HelpButton.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +- HelpButton.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] - HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] + HelpButton.icon [lazy] 26,26 com.formdev.flatlaf.icons.FlatHelpButtonIcon [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 d3942343..3aaa463b 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -71,25 +71,25 @@ Button.default.background #ffffff HSL 0 0 100 javax.swing.plaf.Colo Button.default.borderColor #4f9ee3 HSL 208 73 60 javax.swing.plaf.ColorUIResource [UI] Button.default.borderWidth 2 Button.default.focusColor #97c3f3 HSL 211 79 77 javax.swing.plaf.ColorUIResource [UI] -Button.default.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] -Button.default.focusedBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] +Button.default.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] +Button.default.focusedBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] Button.default.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Button.default.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) -Button.default.hoverBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] +Button.default.hoverBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] Button.default.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) Button.defaultButtonFollowsFocus false Button.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] -Button.disabledBorderColor #cfcfcf HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] +Button.disabledBorderColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] Button.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] Button.disabledSelectedBackground #dedede HSL 0 0 87 com.formdev.flatlaf.util.DerivedColor [UI] darken(13% autoInverse) Button.disabledText #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] -Button.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] -Button.focusedBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] +Button.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] +Button.focusedBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] Button.font [active] $defaultFont [UI] Button.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] Button.highlight #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] Button.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) -Button.hoverBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] +Button.hoverBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] Button.iconTextGap 4 Button.innerFocusWidth 0 Button.light #e3e3e3 HSL 0 0 89 javax.swing.plaf.ColorUIResource [UI] @@ -129,10 +129,10 @@ CheckBox.icon.checkmarkColor #4f9ee3 HSL 208 73 60 javax.swing.plaf.Colo CheckBox.icon.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledBorderColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.disabledCheckmarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon.focusedBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.focusedBorderColor #7a9ec5 HSL 211 39 63 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) -CheckBox.icon.hoverBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon.hoverBorderColor #7a9ec5 HSL 211 39 63 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) CheckBox.icon.selectedBackground #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon.selectedBorderColor #b0b0b0 HSL 0 0 69 javax.swing.plaf.ColorUIResource [UI] @@ -140,10 +140,10 @@ CheckBox.icon [lazy] 15,15 com.formdev.flatlaf.icons.FlatChe CheckBox.iconTextGap 4 CheckBox.icon[filled].checkmarkColor #ffffff HSL 0 0 100 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon[filled].selectedBackground #4f9ee3 HSL 208 73 60 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon[filled].selectedBorderColor #4b97d9 HSL 208 65 57 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon[filled].selectedBorderColor #4b96d8 HSL 208 64 57 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon[filled].selectedFocusedBackground #4f9ee3 HSL 208 73 60 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon[filled].selectedFocusedBorderColor #accff7 HSL 212 82 82 javax.swing.plaf.ColorUIResource [UI] -CheckBox.icon[filled].selectedFocusedCheckmarkColor #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon[filled].selectedFocusedBorderColor #a7cff1 HSL 208 73 80 javax.swing.plaf.ColorUIResource [UI] +CheckBox.icon[filled].selectedFocusedCheckmarkColor #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] CheckBox.icon[filled].selectedHoverBackground #3992e0 HSL 208 73 55 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse) CheckBox.icon[filled].selectedPressedBackground #2386dc HSL 208 73 50 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) CheckBox.margin 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] @@ -224,12 +224,12 @@ Component.arc 5 Component.arrowType chevron Component.borderColor #c4c4c4 HSL 0 0 77 javax.swing.plaf.ColorUIResource [UI] Component.custom.borderColor #f38d8d HSL 0 81 75 com.formdev.flatlaf.util.DerivedColor [UI] desaturate(20%) lighten(25%) -Component.disabledBorderColor #cfcfcf HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] +Component.disabledBorderColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] Component.error.borderColor #ebb8bc HSL 355 56 82 javax.swing.plaf.ColorUIResource [UI] Component.error.focusedBorderColor #e53e4d HSL 355 76 57 javax.swing.plaf.ColorUIResource [UI] Component.focusColor #97c3f3 HSL 211 79 77 javax.swing.plaf.ColorUIResource [UI] Component.focusWidth 0 -Component.focusedBorderColor #87afda HSL 211 53 69 javax.swing.plaf.ColorUIResource [UI] +Component.focusedBorderColor #88b0db HSL 211 54 70 javax.swing.plaf.ColorUIResource [UI] Component.grayFilter [lazy] [unknown type] com.formdev.flatlaf.util.GrayFilter Component.hideMnemonics true Component.innerFocusWidth 0.5 @@ -337,10 +337,10 @@ HelpButton.borderWidth 1 HelpButton.disabledBackground #f2f2f2 HSL 0 0 95 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledBorderColor #bdbdbd HSL 0 0 74 javax.swing.plaf.ColorUIResource [UI] HelpButton.disabledQuestionMarkColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] -HelpButton.focusedBackground #e3f1fa HSL 203 70 94 javax.swing.plaf.ColorUIResource [UI] -HelpButton.focusedBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI] +HelpButton.focusedBackground #eaf3fb HSL 208 68 95 javax.swing.plaf.ColorUIResource [UI] +HelpButton.focusedBorderColor #7a9ec5 HSL 211 39 63 javax.swing.plaf.ColorUIResource [UI] HelpButton.hoverBackground #f7f7f7 HSL 0 0 97 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) -HelpButton.hoverBorderColor #7b9fc7 HSL 212 40 63 javax.swing.plaf.ColorUIResource [UI] +HelpButton.hoverBorderColor #7a9ec5 HSL 211 39 63 javax.swing.plaf.ColorUIResource [UI] HelpButton.icon [lazy] 22,22 com.formdev.flatlaf.icons.FlatHelpButtonIcon [UI] HelpButton.innerFocusWidth 0 HelpButton.pressedBackground #e6e6e6 HSL 0 0 90 com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) @@ -433,7 +433,7 @@ JXMonthView.monthDownFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.Fla JXMonthView.monthStringBackground #dfdfdf HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] JXMonthView.monthStringForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] JXMonthView.monthUpFileName [lazy] 20,20 com.formdev.flatlaf.swingx.ui.FlatMonthUpIcon [UI] -JXMonthView.selectedBackground #b9cef8 HSL 220 82 85 javax.swing.plaf.ColorUIResource [UI] +JXMonthView.selectedBackground #bfdaf2 HSL 208 66 85 javax.swing.plaf.ColorUIResource [UI] JXMonthView.trailingDayForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] JXMonthView.unselectableDayForeground #e02222 HSL 0 75 51 javax.swing.plaf.ColorUIResource [UI] JXMonthView.weekOfTheYearForeground #666666 HSL 0 0 40 javax.swing.plaf.ColorUIResource [UI] @@ -1022,7 +1022,7 @@ TabbedPane.darkShadow #9e9e9e HSL 0 0 62 javax.swing.plaf.Colo TabbedPane.disabledForeground #8c8c8c HSL 0 0 55 javax.swing.plaf.ColorUIResource [UI] TabbedPane.disabledUnderlineColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] TabbedPane.focus #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] -TabbedPane.focusColor #dae4ed HSL 208 35 89 javax.swing.plaf.ColorUIResource [UI] +TabbedPane.focusColor #dee6ed HSL 208 29 90 javax.swing.plaf.ColorUIResource [UI] TabbedPane.font [active] $defaultFont [UI] TabbedPane.foreground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] TabbedPane.hasFullBorder false @@ -1251,7 +1251,7 @@ ToggleButton.selectedBackground #cccccc HSL 0 0 80 com.formdev.flatlaf. ToggleButton.selectedForeground #000000 HSL 0 0 0 javax.swing.plaf.ColorUIResource [UI] ToggleButton.shadow #c4c4c4 HSL 0 0 77 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.disabledUnderlineColor #ababab HSL 0 0 67 javax.swing.plaf.ColorUIResource [UI] -ToggleButton.tab.focusBackground #dae4ed HSL 208 35 89 javax.swing.plaf.ColorUIResource [UI] +ToggleButton.tab.focusBackground #dee6ed HSL 208 29 90 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.hoverBackground #e0e0e0 HSL 0 0 88 com.formdev.flatlaf.util.DerivedColor [UI] darken(7% autoInverse) ToggleButton.tab.underlineColor #4083c9 HSL 211 56 52 javax.swing.plaf.ColorUIResource [UI] ToggleButton.tab.underlineHeight 2