diff --git a/CHANGELOG.md b/CHANGELOG.md index f0d0f6fa..0f0bb275 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -36,8 +36,10 @@ FlatLaf Change Log buttons and closing last/rightmost tab. (issue #235) - Extras: Added missing export of package `com.formdev.flatlaf.extras.components` to Java 9 module descriptor. -- JIDE Common Layer: Invoke `LookAndFeelFactory.installJideExtension()` when - using FlatLaf UI delegates. (issue #230) +- JIDE Common Layer: + - Invoke `LookAndFeelFactory.installJideExtension()` when using FlatLaf UI + delegates. (issue #230) + - RangeSlider: Fixed slider focused colors in IntelliJ themes. - IntelliJ Themes: - Fixed menu item check colors. - Fixed `MenuItem.underlineSelectionColor`. diff --git a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java index e92cb859..0591cba8 100644 --- a/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java +++ b/flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java @@ -53,6 +53,7 @@ public class FlatRangeSliderUI protected Color trackColor; protected Color thumbColor; protected Color thumbBorderColor; + protected Color focusBaseColor; protected Color focusedColor; protected Color focusedThumbBorderColor; protected Color hoverTrackColor; @@ -118,7 +119,8 @@ public class FlatRangeSliderUI trackColor = UIManager.getColor( "Slider.trackColor" ); thumbColor = UIManager.getColor( "Slider.thumbColor" ); thumbBorderColor = UIManager.getColor( "Slider.thumbBorderColor" ); - focusedColor = FlatUIUtils.getUIColor( "Slider.focusedColor", "Component.focusColor" ); + focusBaseColor = UIManager.getColor( "Component.focusColor" ); + focusedColor = FlatUIUtils.getUIColor( "Slider.focusedColor", focusBaseColor ); focusedThumbBorderColor = FlatUIUtils.getUIColor( "Slider.focusedThumbBorderColor", "Component.focusedBorderColor" ); hoverTrackColor = FlatUIUtils.getUIColor( "Slider.hoverTrackColor", "Slider.hoverThumbColor" ); hoverThumbColor = UIManager.getColor( "Slider.hoverThumbColor" ); @@ -137,6 +139,7 @@ public class FlatRangeSliderUI trackColor = null; thumbColor = null; thumbBorderColor = null; + focusBaseColor = null; focusedColor = null; focusedThumbBorderColor = null; hoverTrackColor = null; @@ -303,6 +306,8 @@ debug*/ ? FlatSliderUI.stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null ) : null; + Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor, focusBaseColor ); + FlatSliderUI.paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth ); }