Skip to content

W
wine-winehq
Commit ed669305 authored by Gerard Patel's avatar Gerard Patel Committed by Alexandre Julliard
Browse files
Options

SetScrollInfo : don't show/hide scrollbar if no parameter (minval,

maxval) change.
parent 7f04a17e
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 2 deletions
controls/scroll.c
View file @ ed669305
...@@ -1278,6 +1278,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1278,6 +1278,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
SCROLLBAR_INFO *infoPtr; SCROLLBAR_INFO *infoPtr;
UINT new_flags; UINT new_flags;
BOOL bChangeParams = FALSE; /* don't show/hide scrollbar if params don't change */
*action = 0; *action = 0;
...@@ -1303,6 +1304,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1303,6 +1304,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
{ {
infoPtr->Page = info->nPage; infoPtr->Page = info->nPage;
*action |= SA_SSI_REFRESH; *action |= SA_SSI_REFRESH;
bChangeParams = TRUE;
} }
} }
...@@ -1327,6 +1329,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1327,6 +1329,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
{ {
infoPtr->MinVal = 0; infoPtr->MinVal = 0;
infoPtr->MaxVal = 0; infoPtr->MaxVal = 0;
bChangeParams = TRUE;
} }
else else
{ {
...@@ -1336,6 +1339,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1336,6 +1339,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
*action |= SA_SSI_REFRESH; *action |= SA_SSI_REFRESH;
infoPtr->MinVal = info->nMin; infoPtr->MinVal = info->nMin;
infoPtr->MaxVal = info->nMax; infoPtr->MaxVal = info->nMax;
bChangeParams = TRUE;
} }
} }
} }
...@@ -1375,7 +1379,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1375,7 +1379,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
new_flags = ESB_DISABLE_BOTH; new_flags = ESB_DISABLE_BOTH;
*action |= SA_SSI_REFRESH; *action |= SA_SSI_REFRESH;
} }
else if (nBar != SB_CTL) else if ((nBar != SB_CTL) && bChangeParams)
{ {
*action = SA_SSI_HIDE; *action = SA_SSI_HIDE;
goto done; goto done;
...@@ -1384,7 +1388,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, ...@@ -1384,7 +1388,7 @@ INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar,
else /* Show and enable scroll-bar */ else /* Show and enable scroll-bar */
{ {
new_flags = 0; new_flags = 0;
if (nBar != SB_CTL) if ((nBar != SB_CTL) && bChangeParams)
*action |= SA_SSI_SHOW; *action |= SA_SSI_SHOW;
} }
......
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