From 5eaebde437f93d605110d99701f230b179c1ca90 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Thu, 12 May 2022 14:47:58 +0200 Subject: [PATCH] macOS themes: added some ScrollBar UI properties so that themes look the same on Windows or Linux as on macOS (issue #497) --- .../com/formdev/flatlaf/themes/FlatMacDarkLaf.properties | 6 ++++++ .../com/formdev/flatlaf/themes/FlatMacLightLaf.properties | 6 ++++++ flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt | 8 ++++---- .../dumps/uidefaults/FlatMacLightLaf_1.8.0.txt | 8 ++++---- 4 files changed, 20 insertions(+), 8 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 074696ece..5d73e7e7d 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 @@ -192,6 +192,12 @@ ScrollBar.width = 12 ScrollBar.track = @componentBackground ScrollBar.thumb = @buttonBackground +# from FlatLaf.properties (when using not on macOS) +ScrollBar.minimumThumbSize = 18,18 +ScrollBar.thumbInsets = 2,2,2,2 +ScrollBar.thumbArc = 999 +ScrollBar.hoverThumbWithTrack = true + #---- Separator ---- 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 67bf8f2eb..6c008cf2a 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 @@ -192,6 +192,12 @@ ScrollBar.width = 12 ScrollBar.track = darken(@componentBackground,2%) ScrollBar.thumb = darken(@componentBackground,24%) +# from FlatLaf.properties (when using not on macOS) +ScrollBar.minimumThumbSize = 18,18 +ScrollBar.thumbInsets = 2,2,2,2 +ScrollBar.thumbArc = 999 +ScrollBar.hoverThumbWithTrack = true + #---- Separator ---- diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt index 01fc6e80c..0ccb3f11f 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacDarkLaf_1.8.0.txt @@ -869,21 +869,21 @@ ScrollBar.buttonDisabledArrowColor #777777 HSL 0 0 47 javax.swing.plaf. ScrollBar.foreground #dddddd HSL 0 0 87 javax.swing.plaf.ColorUIResource [UI] ScrollBar.hoverButtonBackground #2b2b2b HSL 0 0 17 com.formdev.flatlaf.util.DerivedColor [UI] lighten(5%) ScrollBar.hoverThumbColor #707070 HSL 0 0 44 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%) -ScrollBar.hoverThumbWithTrack false +ScrollBar.hoverThumbWithTrack true ScrollBar.hoverTrackColor #323232 HSL 0 0 20 com.formdev.flatlaf.util.DerivedColor [UI] lighten(4%) ScrollBar.maximumThumbSize 100000,100000 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumButtonSize 12,12 javax.swing.plaf.DimensionUIResource [UI] -ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI] +ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.pressedButtonBackground #383838 HSL 0 0 22 com.formdev.flatlaf.util.DerivedColor [UI] lighten(10%) ScrollBar.pressedThumbColor #7c7c7c HSL 0 0 49 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15%) ScrollBar.pressedThumbWithTrack false ScrollBar.showButtons false ScrollBar.squareButtons false ScrollBar.thumb #565656 HSL 0 0 34 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.thumbArc 0 +ScrollBar.thumbArc 999 ScrollBar.thumbDarkShadow #ffffff19 10% HSLA 0 0 100 10 javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #bfbfbf19 10% HSLA 0 0 75 10 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] +ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ScrollBar.thumbShadow #ffffff19 10% HSLA 0 0 100 10 javax.swing.plaf.ColorUIResource [UI] ScrollBar.track #282828 HSL 0 0 16 javax.swing.plaf.ColorUIResource [UI] ScrollBar.trackArc 0 diff --git a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt index 49748eb0c..d283fde25 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatMacLightLaf_1.8.0.txt @@ -873,21 +873,21 @@ ScrollBar.buttonDisabledArrowColor #bdbdbd HSL 0 0 74 javax.swing.plaf. ScrollBar.foreground #262626 HSL 0 0 15 javax.swing.plaf.ColorUIResource [UI] ScrollBar.hoverButtonBackground #e9e9e9 HSL 0 0 91 com.formdev.flatlaf.util.DerivedColor [UI] darken(5%) ScrollBar.hoverThumbColor #a9a9a9 HSL 0 0 66 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) -ScrollBar.hoverThumbWithTrack false +ScrollBar.hoverThumbWithTrack true ScrollBar.hoverTrackColor #f2f2f2 HSL 0 0 95 com.formdev.flatlaf.util.DerivedColor [UI] darken(3%) ScrollBar.maximumThumbSize 100000,100000 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.minimumButtonSize 12,12 javax.swing.plaf.DimensionUIResource [UI] -ScrollBar.minimumThumbSize 10,10 javax.swing.plaf.DimensionUIResource [UI] +ScrollBar.minimumThumbSize 18,18 javax.swing.plaf.DimensionUIResource [UI] ScrollBar.pressedButtonBackground #dddddd HSL 0 0 87 com.formdev.flatlaf.util.DerivedColor [UI] darken(10%) ScrollBar.pressedThumbColor #8f8f8f HSL 0 0 56 com.formdev.flatlaf.util.DerivedColor [UI] darken(20%) ScrollBar.pressedThumbWithTrack false ScrollBar.showButtons false ScrollBar.squareButtons false ScrollBar.thumb #c2c2c2 HSL 0 0 76 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.thumbArc 0 +ScrollBar.thumbArc 999 ScrollBar.thumbDarkShadow #00000026 15% HSLA 0 0 0 15 javax.swing.plaf.ColorUIResource [UI] ScrollBar.thumbHighlight #40404026 15% HSLA 0 0 25 15 javax.swing.plaf.ColorUIResource [UI] -ScrollBar.thumbInsets 0,0,0,0 javax.swing.plaf.InsetsUIResource [UI] +ScrollBar.thumbInsets 2,2,2,2 javax.swing.plaf.InsetsUIResource [UI] ScrollBar.thumbShadow #00000026 15% HSLA 0 0 0 15 javax.swing.plaf.ColorUIResource [UI] ScrollBar.track #fafafa HSL 0 0 98 javax.swing.plaf.ColorUIResource [UI] ScrollBar.trackArc 0