diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java index cdbaa116..75531b0e 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/IntelliJTheme.java @@ -371,6 +371,9 @@ public class IntelliJTheme uiKeyMapping.put( "ProgressBar.trackColor", "ProgressBar.background" ); uiKeyMapping.put( "ProgressBar.progressColor", "ProgressBar.foreground" ); + // Slider + uiKeyMapping.put( "Slider.trackWidth", "" ); // ignore (used in Material Theme UI Lite) + for( Map.Entry e : uiKeyMapping.entrySet() ) uiKeyInverseMapping.put( e.getValue(), e.getKey() ); 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 b4b6ab7f..0e3fa2f9 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 @@ -52,7 +52,7 @@ import com.formdev.flatlaf.util.UIScale; * @uiDefault Slider.thumbWidth int * @uiDefault Slider.trackColor Color * @uiDefault Slider.thumbColor Color - * @uiDefault Slider.focusedColor Color + * @uiDefault Slider.focusedColor Color optional; defaults to Component.focusColor * @uiDefault Slider.hoverColor Color optional; defaults to Slider.focusedColor * @uiDefault Slider.disabledForeground Color used for track and thumb is disabled * @@ -110,7 +110,7 @@ public class FlatSliderUI trackColor = UIManager.getColor( "Slider.trackColor" ); thumbColor = UIManager.getColor( "Slider.thumbColor" ); - focusColor = UIManager.getColor( "Slider.focusedColor" ); + focusColor = FlatUIUtils.getUIColor( "Slider.focusedColor", "Component.focusColor" ); hoverColor = FlatUIUtils.getUIColor( "Slider.hoverColor", focusColor ); disabledForeground = UIManager.getColor( "Slider.disabledForeground" ); } @@ -201,7 +201,7 @@ public class FlatSliderUI } if( coloredTrack != null ) { - g.setColor( slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor) ); + FlatUIUtils.setColor( g, slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor), thumbColor ); ((Graphics2D)g).fill( coloredTrack ); } @@ -211,9 +211,10 @@ public class FlatSliderUI @Override public void paintThumb( Graphics g ) { - g.setColor( slider.isEnabled() + FlatUIUtils.setColor( g, slider.isEnabled() ? (slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor)) - : disabledForeground ); + : disabledForeground, + thumbColor ); if( isRoundThumb() ) g.fillOval( thumbRect.x, thumbRect.y, thumbRect.width, thumbRect.height ); 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 b1e10283..2b2779e4 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatDarkLaf.properties @@ -177,8 +177,7 @@ Separator.foreground=515151 Slider.trackColor=646464 Slider.thumbColor=A6A6A6 Slider.tickColor=888888 -Slider.focusedColor=@@Component.focusColor -Slider.hoverColor=888888 +Slider.hoverColor=darken(15%,autoInverse) 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 4e3ba28b..44879ed2 100644 --- a/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties +++ b/flatlaf-core/src/main/resources/com/formdev/flatlaf/FlatLightLaf.properties @@ -184,8 +184,7 @@ Separator.foreground=cdcdcd Slider.trackColor=c4c4c4 Slider.thumbColor=6e6e6e Slider.tickColor=888888 -Slider.focusedColor=@@Component.focusColor -Slider.hoverColor=999999 +Slider.hoverColor=lighten(15%,autoInverse) Slider.disabledForeground=c0c0c0