Changeset 38312 in webkit

Timestamp:

Nov 11, 2008 12:43:57 PM (15 years ago)

Author:

hyatt@apple.com

Message:

2008-11-11 David Hyatt <​hyatt@apple.com>

​https://bugs.webkit.org/show_bug.cgi?id=22182

Fix problems with scrollbars when the OS setting for clicks in the track jumping the thumb to that location
is turned on. Make sure to only jump the thumb if the click happens in the track. Also fix some math
errors when jumping the thumb that cause dragging after the jump to incorrectly jump the thumb again.

Reviewed by Adele

• platform/Scrollbar.cpp: (WebCore::Scrollbar::mouseDown):

Location:

trunk/WebCore

Files:

• ChangeLog (modified) (1 diff)
• platform/Scrollbar.cpp (modified) (1 diff)

trunk/WebCore/ChangeLog

@@ +1 @@
+2008-11-11  David Hyatt  <hyatt@apple.com>
+
+        https://bugs.webkit.org/show_bug.cgi?id=22182
+
+        Fix problems with scrollbars when the OS setting for clicks in the track jumping the thumb to that location
+        is turned on.  Make sure to only jump the thumb if the click happens in the track.  Also fix some math
+        errors when jumping the thumb that cause dragging after the jump to incorrectly jump the thumb again.
+
+        Reviewed by Adele
+
+        * platform/Scrollbar.cpp:
+        (WebCore::Scrollbar::mouseDown):
+
 2008-11-11  Beth Dakin  <bdakin@apple.com>
 

trunk/WebCore/platform/Scrollbar.cpp

@@ -365 +365 @@
     int pressedPos = (orientation() == HorizontalScrollbar ? convertFromContainingWindow(evt.pos()).x() : convertFromContainingWindow(evt.pos()).y());
     
-    if (theme()->shouldCenterOnThumb(this, evt)) {
+    if ((pressedPart() == BackTrackPart || pressedPart() == ForwardTrackPart) && theme()->shouldCenterOnThumb(this, evt)) {
         setHoveredPart(ThumbPart);
         setPressedPart(ThumbPart);
         int thumbLen = theme()->thumbLength(this);
-        int desiredPos = pressedPos - thumbLen / 2;
-        // Set the pressed position to the top of the thumb so that when we do the move, the delta
+        int desiredPos = pressedPos;
+        // Set the pressed position to the middle of the thumb so that when we do the move, the delta
         // will be from the current pixel position of the thumb to the new desired position for the thumb.
-        m_pressedPos = theme()->trackPosition(this) + theme()->thumbPosition(this);
+        m_pressedPos = theme()->trackPosition(this) + theme()->thumbPosition(this) + thumbLen / 2;
         moveThumb(desiredPos);
         return true;