comctl32/status: Checking size grip bounds in x-axis only.

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

comctl32/status: Checking size grip bounds in x-axis only.
0f12fa1e · Waritnan Sookbuntherng · Alexandre Julliard · 1bb95af3 · 0f12fa1e · 0f12fa1e
Commit 0f12fa1e authored Dec 10, 2018 by Waritnan Sookbuntherng Committed by Alexandre Julliard Dec 10, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 11 additions and 14 deletions

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

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

No files found.
--- a/dlls/comctl32/status.c
+++ b/dlls/comctl32/status.c
@@ -1009,10 +1009,7 @@ STATUSBAR_WMNCHitTest (const STATUS_INFO *infoPtr, INT x, INT y)
 	pt.y = y;
 	ScreenToClient (infoPtr->Self, &pt);

-	rect.left = rect.right - 13;
-	rect.top += 2;
-
-	if (PtInRect (&rect, pt))
+	if (pt.x >= rect.right - GetSystemMetrics(SM_CXVSCROLL))
        {
            if (GetWindowLongW( infoPtr->Self, GWL_EXSTYLE ) & WS_EX_LAYOUTRTL) return HTBOTTOMLEFT;
 	    else return HTBOTTOMRIGHT;

--- a/dlls/comctl32/tests/status.c
+++ b/dlls/comctl32/tests/status.c
@@ -615,17 +615,17 @@ static void test_sizegrip(void)

    /* check bounds when not maximized */
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top));
-    todo_wine expect(HTBOTTOMRIGHT, r);
+    expect(HTBOTTOMRIGHT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left - 1, rc.top));
    expect(HTCLIENT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1));
-    todo_wine expect(HTBOTTOMRIGHT, r);
+    expect(HTBOTTOMRIGHT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom));
-    todo_wine expect(HTBOTTOMRIGHT, r);
+    expect(HTBOTTOMRIGHT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom));
-    todo_wine expect(HTBOTTOMRIGHT, r);
+    expect(HTBOTTOMRIGHT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1));
-    todo_wine expect(HTBOTTOMRIGHT, r);
+    expect(HTBOTTOMRIGHT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom - 1));
    expect(HTBOTTOMRIGHT, r);

@@ -638,17 +638,17 @@ static void test_sizegrip(void)
    rc.right = pt.x;

    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top));
-    todo_wine expect(HTBOTTOMLEFT, r);
+    expect(HTBOTTOMLEFT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left + 1, rc.top));
    expect(HTCLIENT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.left, rc.top - 1));
-    todo_wine expect(HTBOTTOMLEFT, r);
+    expect(HTBOTTOMLEFT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom));
-    todo_wine expect(HTBOTTOMLEFT, r);
+    expect(HTBOTTOMLEFT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right - 1, rc.bottom));
-    todo_wine expect(HTBOTTOMLEFT, r);
+    expect(HTBOTTOMLEFT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right, rc.bottom + 1));
-    todo_wine expect(HTBOTTOMLEFT, r);
+    expect(HTBOTTOMLEFT, r);
    r = SendMessageA(hwndStatus, WM_NCHITTEST, 0, MAKELPARAM(rc.right + 1, rc.bottom - 1));
    expect(HTBOTTOMLEFT, r);