comctl32/status: Hide size grip when the parent window is maximized.

Signed-off-by: Waritnan Sookbuntherng <lion328@hotmail.co.th> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32/status: Hide size grip when the parent window is maximized.
1bb95af3 · Waritnan Sookbuntherng · Alexandre Julliard · d8428406 · 1bb95af3 · 1bb95af3
Commit 1bb95af3 authored Dec 10, 2018 by Waritnan Sookbuntherng Committed by Alexandre Julliard Dec 10, 2018
Show whitespace changes
Inline Side-by-side

Showing with 6 additions and 4 deletions

status.c dlls/comctl32/status.c +4 -2

status.c dlls/comctl32/tests/status.c +2 -2

No files found.
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -284,7 +284,8 @@ STATUSBAR_Refresh (STATUS_INFO *infoPtr, HDC hdc)

    SelectObject (hdc, hOldFont);

-    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+    if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+            && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE))
 	    STATUSBAR_DrawSizeGrip (theme, hdc, &rect);

    return 0;
@@ -997,7 +998,8 @@ STATUSBAR_WMGetText (const STATUS_INFO *infoPtr, INT size, LPWSTR buf)
 static BOOL
 STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y)
 {
-    if (GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP) {
+    if ((GetWindowLongW (infoPtr->Self, GWL_STYLE) & SBARS_SIZEGRIP)
+            && !(GetWindowLongW (infoPtr->Notify, GWL_STYLE) & WS_MAXIMIZE)) {
 	RECT  rect;
 	POINT pt;


--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -682,7 +682,7 @@ static void test_sizegrip(void)
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1));
    expect(HTNOWHERE, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1));
-    todo_wine expect(HTCLIENT, r);
+    expect(HTCLIENT, r);

    /* maximized with right-to-left */
    SetWindowLongA(hwndStatus, GWL_EXSTYLE, WS_EX_LAYOUTRTL);
@@ -705,7 +705,7 @@ static void test_sizegrip(void)
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1));
    expect(HTNOWHERE, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1));
-    todo_wine expect(HTCLIENT, r);
+    expect(HTCLIENT, r);

    SetWindowLongA(g_hMainWnd, GWL_STYLE, style);
    DestroyWindow(hwndStatus);