Spinner: no longer use focusedColor for hover

This commit is contained in:
Karl Tauber
2019-09-13 00:17:26 +02:00
parent dee1f77c51
commit da8e7ee2d3
3 changed files with 4 additions and 2 deletions

View File

@@ -186,7 +186,7 @@ public class FlatSliderUI
} }
if( coloredTrack != null ) { if( coloredTrack != null ) {
g.setColor( hover ? hoverColor : (slider.hasFocus() ? focusColor : thumbColor) ); g.setColor( slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor) );
((Graphics2D)g).fill( coloredTrack ); ((Graphics2D)g).fill( coloredTrack );
} }
@@ -197,7 +197,7 @@ public class FlatSliderUI
@Override @Override
public void paintThumb( Graphics g ) { public void paintThumb( Graphics g ) {
g.setColor( slider.isEnabled() g.setColor( slider.isEnabled()
? (hover ? hoverColor : (slider.hasFocus() ? focusColor : thumbColor)) ? (slider.hasFocus() ? focusColor : (hover ? hoverColor : thumbColor))
: disabledForeground ); : disabledForeground );
if( isRoundThumb() ) if( isRoundThumb() )

View File

@@ -180,6 +180,7 @@ Slider.trackColor=646464
Slider.thumbColor=A6A6A6 Slider.thumbColor=A6A6A6
Slider.tickColor=888888 Slider.tickColor=888888
Slider.focusedColor=@@Component.focusColor Slider.focusedColor=@@Component.focusColor
Slider.hoverColor=888888
Slider.disabledForeground=4c5052 Slider.disabledForeground=4c5052

View File

@@ -186,6 +186,7 @@ Slider.trackColor=c4c4c4
Slider.thumbColor=6e6e6e Slider.thumbColor=6e6e6e
Slider.tickColor=888888 Slider.tickColor=888888
Slider.focusedColor=@@Component.focusColor Slider.focusedColor=@@Component.focusColor
Slider.hoverColor=999999
Slider.disabledForeground=c0c0c0 Slider.disabledForeground=c0c0c0