Mirrors/FlatLaf
1
0
Fork 0
mirror of https://github.com/JFormDesigner/FlatLaf.git synced 2025-12-06 14:00:55 +03:00
Code Issues Actions Packages Projects Releases Wiki Activity

JIDE: RangeSlider: fixed slider focused colors in IntelliJ themes (see commit 1fb0783808)

Browse Source
This commit is contained in:
Karl Tauber
2021-01-14 13:36:01 +01:00
parent 3c086a92e2
commit 0dab1b73cc
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
CHANGELOG.md
View File

@@ -36,8 +36,10 @@ FlatLaf Change Log
buttons and closing last/rightmost tab. (issue #235) buttons and closing last/rightmost tab. (issue #235)
- Extras: Added missing export of package - Extras: Added missing export of package
`com.formdev.flatlaf.extras.components` to Java 9 module descriptor. `com.formdev.flatlaf.extras.components` to Java 9 module descriptor.
- JIDE Common Layer: Invoke `LookAndFeelFactory.installJideExtension()` when - JIDE Common Layer:
using FlatLaf UI delegates. (issue #230) - Invoke `LookAndFeelFactory.installJideExtension()` when using FlatLaf UI
delegates. (issue #230)
- RangeSlider: Fixed slider focused colors in IntelliJ themes.
- IntelliJ Themes: - IntelliJ Themes:
- Fixed menu item check colors. - Fixed menu item check colors.
- Fixed `MenuItem.underlineSelectionColor`. - Fixed `MenuItem.underlineSelectionColor`.

7
flatlaf-jide-oss/src/main/java/com/formdev/flatlaf/jideoss/ui/FlatRangeSliderUI.java
View File

@@ -53,6 +53,7 @@ public class FlatRangeSliderUI
protected Color trackColor; protected Color trackColor;
protected Color thumbColor; protected Color thumbColor;
protected Color thumbBorderColor; protected Color thumbBorderColor;
protected Color focusBaseColor;
protected Color focusedColor; protected Color focusedColor;
protected Color focusedThumbBorderColor; protected Color focusedThumbBorderColor;
protected Color hoverTrackColor; protected Color hoverTrackColor;
@@ -118,7 +119,8 @@ public class FlatRangeSliderUI
trackColor = UIManager.getColor( "Slider.trackColor" ); trackColor = UIManager.getColor( "Slider.trackColor" );
thumbColor = UIManager.getColor( "Slider.thumbColor" ); thumbColor = UIManager.getColor( "Slider.thumbColor" );
thumbBorderColor = UIManager.getColor( "Slider.thumbBorderColor" ); 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" ); focusedThumbBorderColor = FlatUIUtils.getUIColor( "Slider.focusedThumbBorderColor", "Component.focusedBorderColor" );
hoverTrackColor = FlatUIUtils.getUIColor( "Slider.hoverTrackColor", "Slider.hoverThumbColor" ); hoverTrackColor = FlatUIUtils.getUIColor( "Slider.hoverTrackColor", "Slider.hoverThumbColor" );
hoverThumbColor = UIManager.getColor( "Slider.hoverThumbColor" ); hoverThumbColor = UIManager.getColor( "Slider.hoverThumbColor" );
@@ -137,6 +139,7 @@ public class FlatRangeSliderUI
trackColor = null; trackColor = null;
thumbColor = null; thumbColor = null;
thumbBorderColor = null; thumbBorderColor = null;
focusBaseColor = null;
focusedColor = null; focusedColor = null;
focusedThumbBorderColor = null; focusedThumbBorderColor = null;
hoverTrackColor = null; hoverTrackColor = null;
@@ -303,6 +306,8 @@ debug*/
? FlatSliderUI.stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null ) ? FlatSliderUI.stateColor( slider, false, false, thumbBorderColor, disabledThumbBorderColor, focusedThumbBorderColor, null, null )
: null; : null;
Color focusedColor = FlatUIUtils.deriveColor( this.focusedColor, focusBaseColor );
FlatSliderUI.paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth ); FlatSliderUI.paintThumb( g, slider, thumbRect, isRoundThumb(), color, borderColor, focusedColor, focusWidth );
} }