Commit ac4de71f authored by Dmitry Timoshkov's avatar Dmitry Timoshkov Committed by Alexandre Julliard

user: Postpone resetting SCROLL_TrackingWin untill all notifications are sent.

parent aef4a77d
...@@ -953,7 +953,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) ...@@ -953,7 +953,7 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
{ {
if (SCROLL_MovingThumb) if (SCROLL_MovingThumb)
SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize); SCROLL_DrawMovingThumb(hdc, &rect, vertical, arrowSize, thumbSize);
SCROLL_TrackingWin = 0;
SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize, SCROLL_DrawInterior( hwnd, hdc, nBar, &rect, arrowSize, thumbSize,
thumbPos, infoPtr->flags, vertical, thumbPos, infoPtr->flags, vertical,
FALSE, FALSE ); FALSE, FALSE );
...@@ -1049,8 +1049,12 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt) ...@@ -1049,8 +1049,12 @@ static void SCROLL_HandleScrollEvent( HWND hwnd, INT nBar, UINT msg, POINT pt)
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl ); MAKEWPARAM( SB_THUMBPOSITION, val ), (LPARAM)hwndCtl );
} }
/* SB_ENDSCROLL doesn't report thumb position */
SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL, SendMessageW( hwndOwner, vertical ? WM_VSCROLL : WM_HSCROLL,
SB_ENDSCROLL, (LPARAM)hwndCtl ); SB_ENDSCROLL, (LPARAM)hwndCtl );
/* Terminate tracking */
SCROLL_TrackingWin = 0;
} }
ReleaseDC( hwnd, hdc ); ReleaseDC( hwnd, hdc );
...@@ -1200,6 +1204,10 @@ static BOOL SCROLL_GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info) ...@@ -1200,6 +1204,10 @@ static BOOL SCROLL_GetScrollInfo(HWND hwnd, INT nBar, LPSCROLLINFO info)
info->nMax = infoPtr->maxVal; info->nMax = infoPtr->maxVal;
} }
TRACE("cbSize %02x fMask %04x nMin %d nMax %d nPage %u nPos %d nTrackPos %d\n",
info->cbSize, info->fMask, info->nMin, info->nMax, info->nPage,
info->nPos, info->nTrackPos);
return (info->fMask & SIF_ALL) != 0; return (info->fMask & SIF_ALL) != 0;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment