From fdc43fc0d30e296618a9d206895fc1e4fd2da191 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Mon, 18 Jan 2021 23:20:25 +0100 Subject: [PATCH] Slider: improved thumb hover and pressed colors Also changed auto-inverse threshold from 50% to 65% for increase and 35% for decrease, because this gives much better results for slider hover and pressed colors. This does not change other colors in core themes, but few colors in some IntelliJ themes (usually checkbox hover/pressed). --- CHANGELOG.md | 1 + .../main/java/com/formdev/flatlaf/util/ColorFunctions.java | 4 ++-- .../main/resources/com/formdev/flatlaf/FlatDarkLaf.properties | 4 ++-- .../resources/com/formdev/flatlaf/FlatLightLaf.properties | 4 ++-- flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt | 4 ++-- flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt | 4 ++-- 6 files changed, 11 insertions(+), 10 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index c6e1f611..5487c9e4 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -13,6 +13,7 @@ FlatLaf Change Log buttons. - Slider: Support per component custom thumb and track colors via `JSlider.setForeground(Color)` and `JSlider.setBackground(Color)`. +- Slider: Improved thumb hover and pressed colors. - TextComponent: Clip placeholder text if it does not fit into visible area. (PR #229) - macOS: Improved font rendering on macOS when using JetBrains Runtime. (PRs diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java index 3e4e5963..12ee1b34 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/util/ColorFunctions.java @@ -125,8 +125,8 @@ public class ColorFunctions protected boolean shouldInverse( float[] hsla ) { return increase - ? hsla[hslIndex] >= 50 - : hsla[hslIndex] < 50; + ? hsla[hslIndex] > 65 + : hsla[hslIndex] < 35; } } 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 33e70d87..cca3abab 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -245,8 +245,8 @@ Slider.trackColor = #646464 Slider.thumbColor = $Slider.trackValueColor Slider.tickColor = #888 Slider.focusedColor = fade($Component.focusColor,70%,derived) -Slider.hoverThumbColor = darken($Slider.thumbColor,10%,derived) -Slider.pressedThumbColor = darken($Slider.thumbColor,15%,derived) +Slider.hoverThumbColor = lighten($Slider.thumbColor,5%,derived) +Slider.pressedThumbColor = lighten($Slider.thumbColor,8%,derived) Slider.disabledTrackColor = #4c5052 Slider.disabledThumbColor = $Slider.disabledTrackColor 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 e93b82c3..0e88114b 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -257,8 +257,8 @@ Slider.trackColor = #c4c4c4 Slider.thumbColor = $Slider.trackValueColor Slider.tickColor = #888 Slider.focusedColor = fade($Component.focusColor,50%,derived) -Slider.hoverThumbColor = lighten($Slider.thumbColor,10%,derived) -Slider.pressedThumbColor = lighten($Slider.thumbColor,15%,derived) +Slider.hoverThumbColor = darken($Slider.thumbColor,5%,derived) +Slider.pressedThumbColor = darken($Slider.thumbColor,8%,derived) Slider.disabledTrackColor = #c0c0c0 Slider.disabledThumbColor = $Slider.disabledTrackColor 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 96b1a394..72a4a061 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatDarkLaf_1.8.0_202.txt @@ -851,11 +851,11 @@ 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.hoverThumbColor #346faa com.formdev.flatlaf.util.DerivedColor [UI] darken(10% autoInverse) +Slider.hoverThumbColor #5d95cd com.formdev.flatlaf.util.DerivedColor [UI] lighten(5% autoInverse) Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true -Slider.pressedThumbColor #2e6296 com.formdev.flatlaf.util.DerivedColor [UI] darken(15% autoInverse) +Slider.pressedThumbColor #699cd1 com.formdev.flatlaf.util.DerivedColor [UI] lighten(8% autoInverse) Slider.shadow #646464 javax.swing.plaf.ColorUIResource [UI] Slider.thumbColor #4a88c7 javax.swing.plaf.ColorUIResource [UI] Slider.thumbSize 12,12 javax.swing.plaf.DimensionUIResource [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 4509a66a..95605d42 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatLightLaf_1.8.0_202.txt @@ -857,11 +857,11 @@ 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.hoverThumbColor #1569bc com.formdev.flatlaf.util.DerivedColor [UI] lighten(10% autoInverse) +Slider.hoverThumbColor #1775d3 com.formdev.flatlaf.util.DerivedColor [UI] darken(5% autoInverse) Slider.minimumHorizontalSize 36,21 java.awt.Dimension Slider.minimumVerticalSize 21,36 java.awt.Dimension Slider.onlyLeftMouseButtonDrag true -Slider.pressedThumbColor #125ca5 com.formdev.flatlaf.util.DerivedColor [UI] lighten(15% autoInverse) +Slider.pressedThumbColor #166ec5 com.formdev.flatlaf.util.DerivedColor [UI] darken(8% autoInverse) Slider.shadow #c4c4c4 javax.swing.plaf.ColorUIResource [UI] Slider.thumbColor #1e82e6 javax.swing.plaf.ColorUIResource [UI] Slider.thumbSize 12,12 javax.swing.plaf.DimensionUIResource [UI]