ReceiveTempSMS
/
Sweden-Number
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

user32: Improve window state handling in SetScrollInfo(). 

Wine-Bug: https://bugs.winehq.org/show_bug.cgi?id=42038
Signed-off-by: Nikolay Sivov <nsivov@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Nikolay Sivov 2020-01-28 12:26:42 +03:00 committed by Alexandre Julliard
parent 5b9323400d
commit 92d336263c
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
dlls/user32/scroll.c
View File

@ -1750,6 +1750,12 @@ static INT SCROLL_SetScrollInfo( HWND hwnd, INT nBar, LPCSCROLLINFO info, BOOL b
action |= SA_SSI_SHOW; action |= SA_SSI_SHOW;
} }
if (nBar == SB_CTL && bRedraw && IsWindowVisible(hwnd) &&
(new_flags == ESB_ENABLE_BOTH || new_flags == ESB_DISABLE_BOTH))
{
EnableWindow(hwnd, new_flags == ESB_ENABLE_BOTH);
}
if (infoPtr->flags != new_flags) /* check arrow flags */ if (infoPtr->flags != new_flags) /* check arrow flags */
{ {
infoPtr->flags = new_flags; infoPtr->flags = new_flags;

3
dlls/user32/tests/scroll.c
View File

@ -634,7 +634,6 @@ static void test_SetScrollInfo(void)
si.nPage = 50; si.nPage = 50;
SetScrollInfo(hScroll, SB_CTL, &si, TRUE); SetScrollInfo(hScroll, SB_CTL, &si, TRUE);
ret = IsWindowEnabled(hScroll); ret = IsWindowEnabled(hScroll);
todo_wine
ok(ret, "Unexpected enabled state.\n"); ok(ret, "Unexpected enabled state.\n");
si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL; si.fMask = SIF_POS|SIF_RANGE|SIF_PAGE|SIF_DISABLENOSCROLL;
@ -657,7 +656,6 @@ todo_wine
si.nPage = 100; si.nPage = 100;
SetScrollInfo(hScroll, SB_CTL, &si, TRUE); SetScrollInfo(hScroll, SB_CTL, &si, TRUE);
ret = IsWindowEnabled(hScroll); ret = IsWindowEnabled(hScroll);
todo_wine
ok(!ret, "Unexpected enabled state.\n"); ok(!ret, "Unexpected enabled state.\n");
EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH); EnableScrollBar(hScroll, SB_CTL, ESB_DISABLE_BOTH);
@ -671,7 +669,6 @@ todo_wine
si.nPage = 41; si.nPage = 41;
SetScrollInfo(hScroll, SB_CTL, &si, TRUE); SetScrollInfo(hScroll, SB_CTL, &si, TRUE);
ret = IsWindowEnabled(hScroll); ret = IsWindowEnabled(hScroll);
todo_wine
ok(ret, "Unexpected enabled state.\n"); ok(ret, "Unexpected enabled state.\n");
DestroyWindow(hScroll); DestroyWindow(hScroll);