From da8e7ee2d31543b6eb8d002fd6825500a00bcbc9 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Fri, 13 Sep 2019 00:17:26 +0200 Subject: [PATCH] Spinner: no longer use focusedColor for hover --- .../src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java | 4 ++-- .../main/resources/com/formdev/flatlaf/FlatDarkLaf.properties | 1 + .../resources/com/formdev/flatlaf/FlatLightLaf.properties | 1 + 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java index 3732cbab..799f0964 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatSliderUI.java @@ -186,7 +186,7 @@ public class FlatSliderUI } if( coloredTrack != null ) { - g.setColor( hover ? hoverColor : (slider.hasFocus() ? focusColor : thumbColor) ); + g.setColor( slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor) ); ((Graphics2D)g).fill( coloredTrack ); } @@ -197,7 +197,7 @@ public class FlatSliderUI @Override public void paintThumb( Graphics g ) { g.setColor( slider.isEnabled() - ? (hover ? hoverColor : (slider.hasFocus() ? focusColor : thumbColor)) + ? (slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor)) : disabledForeground ); if( isRoundThumb() ) 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 f2c7c29a..a6e0b500 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -180,6 +180,7 @@ Slider.trackColor=646464 Slider.thumbColor=A6A6A6 Slider.tickColor=888888 Slider.focusedColor=@@Component.focusColor +Slider.hoverColor=888888 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 56a558bb..fda5b5d3 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -186,6 +186,7 @@ Slider.trackColor=c4c4c4 Slider.thumbColor=6e6e6e Slider.tickColor=888888 Slider.focusedColor=@@Component.focusColor +Slider.hoverColor=999999 Slider.disabledForeground=c0c0c0