From 8d8b9f3e9896a833b736daaae487e7042053a70d Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 1 Nov 2023 12:57:07 +0100 Subject: [PATCH] macOS themes: fixed `ToolBar.hoverButtonGroupArc` --- .../com/formdev/flatlaf/themes/FlatMacDarkLaf.properties | 5 +++++ .../com/formdev/flatlaf/themes/FlatMacLightLaf.properties | 5 +++++ flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt | 2 +- flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt | 2 +- 4 files changed, 12 insertions(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties index 70865866..3f12be09 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacDarkLaf.properties @@ -295,3 +295,8 @@ ToggleButton.disabledBackground = $Button.disabledBackground ToggleButton.selectedBackground = lighten($ToggleButton.background,20%,derived) ToggleButton.toolbar.selectedBackground = #fff3 + + +#---- ToolBar ---- + +ToolBar.hoverButtonGroupArc = 14 diff --git a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties index a3427fe0..9f9e044d 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/themes/FlatMacLightLaf.properties @@ -291,3 +291,8 @@ TextPane.selectionForeground = @textSelectionForeground #---- ToggleButton ---- ToggleButton.disabledBackground = $Button.disabledBackground + + +#---- ToolBar ---- + +ToolBar.hoverButtonGroupArc = 14 diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt index 41e289f9..14e4925f 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt @@ -1355,7 +1355,7 @@ ToolBar.font [active] $defaultFont [UI] ToolBar.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] ToolBar.gripColor #cecece HSL 0 0 81 javax.swing.plaf.ColorUIResource [UI] ToolBar.highlight #bfbfbf19 10% HSLA 0 0 75 10 javax.swing.plaf.ColorUIResource [UI] -ToolBar.hoverButtonGroupArc 8 +ToolBar.hoverButtonGroupArc 14 ToolBar.hoverButtonGroupBackground #262626 HSL 0 0 15 com.formdev.flatlaf.util.DerivedColor [UI] lighten(3% autoInverse) ToolBar.isRollover true ToolBar.light #cccccc19 10% HSLA 0 0 80 10 javax.swing.plaf.ColorUIResource [UI] diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt index e735c091..4b09126d 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt @@ -1359,7 +1359,7 @@ ToolBar.font [active] $defaultFont [UI] ToolBar.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] ToolBar.gripColor #b4b4b4 HSL 0 0 71 javax.swing.plaf.ColorUIResource [UI] ToolBar.highlight #40404026 15% HSLA 0 0 25 15 javax.swing.plaf.ColorUIResource [UI] -ToolBar.hoverButtonGroupArc 8 +ToolBar.hoverButtonGroupArc 14 ToolBar.hoverButtonGroupBackground #eeeeee HSL 0 0 93 com.formdev.flatlaf.util.DerivedColor [UI] darken(3% autoInverse) ToolBar.isRollover true ToolBar.light #1f1f1f26 15% HSLA 0 0 12 15 javax.swing.plaf.ColorUIResource [UI]