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

user32: Switch to the window DPI awareness for MDI scrolling.

Browse Source 
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
This commit is contained in:
Alexandre Julliard 2018-08-28 12:21:28 +02:00
parent a525631920
commit 440484fc07
1 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dlls/user32/mdi.c
View File

@ -1688,11 +1688,14 @@ BOOL WINAPI TranslateMDISysAccel( HWND hwndClient, LPMSG msg )
*/ */
void WINAPI CalcChildScroll( HWND hwnd, INT scroll ) void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
{ {
DPI_AWARENESS_CONTEXT context;
SCROLLINFO info; SCROLLINFO info;
RECT childRect, clientRect; RECT childRect, clientRect;
HWND *list; HWND *list;
DWORD style; DWORD style;
context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hwnd ));
GetClientRect( hwnd, &clientRect ); GetClientRect( hwnd, &clientRect );
SetRectEmpty( &childRect ); SetRectEmpty( &childRect );
@ -1748,6 +1751,7 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
} }
break; break;
} }
SetThreadDpiAwarenessContext( context );
} }
@ -1757,10 +1761,12 @@ void WINAPI CalcChildScroll( HWND hwnd, INT scroll )
void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam, void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
LPARAM lParam) LPARAM lParam)
{ {
DPI_AWARENESS_CONTEXT context;
INT newPos = -1; INT newPos = -1;
INT curPos, length, minPos, maxPos, shift; INT curPos, length, minPos, maxPos, shift;
RECT rect; RECT rect;
context = SetThreadDpiAwarenessContext( GetWindowDpiAwarenessContext( hWnd ));
GetClientRect( hWnd, &rect ); GetClientRect( hWnd, &rect );
switch(uMsg) switch(uMsg)
@ -1778,7 +1784,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
shift = GetSystemMetrics(SM_CXVSCROLL); shift = GetSystemMetrics(SM_CXVSCROLL);
break; break;
default: default:
return; goto done;
} }
switch( wParam ) switch( wParam )
@ -1801,7 +1807,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
break; break;
case SB_THUMBTRACK: case SB_THUMBTRACK:
return; goto done;
case SB_TOP: case SB_TOP:
newPos = minPos; newPos = minPos;
@ -1811,7 +1817,7 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
break; break;
case SB_ENDSCROLL: case SB_ENDSCROLL:
CalcChildScroll(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ); CalcChildScroll(hWnd,(uMsg == WM_VSCROLL)?SB_VERT:SB_HORZ);
return; goto done;
} }
if( newPos > maxPos ) if( newPos > maxPos )
@ -1828,6 +1834,8 @@ void WINAPI ScrollChildren(HWND hWnd, UINT uMsg, WPARAM wParam,
else else
ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL, ScrollWindowEx(hWnd ,curPos - newPos, 0, NULL, NULL, 0, NULL,
SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN ); SW_INVALIDATE | SW_ERASE | SW_SCROLLCHILDREN );
done:
SetThreadDpiAwarenessContext( context );
} }