From 273d762cd343b8dafb1b7900081c83b6561b043e Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Wed, 17 Jun 2020 23:53:06 +0200 Subject: [PATCH] ScrollBar: avoid continuous repainting scrollbar when moving mouse pointer over track and `ScrollBar.hoverThumbWithTrack` is enabled (regression in fd208a387922f69f72a88dbb826dcaf469376633) --- .../src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java index 0b43498f..46fb4b6b 100644 --- a/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java +++ b/flatlaf-core/src/main/java/com/formdev/flatlaf/ui/FlatScrollBarUI.java @@ -245,7 +245,7 @@ public class FlatScrollBarUI if( thumbBounds.isEmpty() || !scrollbar.isEnabled() ) return; - g.setColor( getThumbColor( c, hoverThumb ) ); + g.setColor( getThumbColor( c, hoverThumb || (hoverThumbWithTrack && hoverTrack) ) ); paintTrackOrThumb( g, c, thumbBounds, thumbInsets, thumbArc ); } @@ -336,7 +336,7 @@ public class FlatScrollBarUI boolean inThumb = getThumbBounds().contains( x, y ); if( inTrack != hoverTrack || inThumb != hoverThumb ) { hoverTrack = inTrack; - hoverThumb = inThumb || (hoverThumbWithTrack && inTrack); + hoverThumb = inThumb; repaint(); } }