comctl32: Offset client area when toolbar divider is present.

Signed-off-by: Piotr Caban <piotr@codeweavers.com> Signed-off-by: Alexandre Julliard <julliard@winehq.org>

comctl32: Offset client area when toolbar divider is present.
37854858 · Piotr Caban · Alexandre Julliard · 659b0d70 · 37854858 · 37854858
Commit 37854858 authored Jul 17, 2020 by Piotr Caban Committed by Alexandre Julliard Jul 17, 2020
Hide whitespace changes
Inline Side-by-side

Showing with 8 additions and 3 deletions

toolbar.c dlls/comctl32/tests/toolbar.c +5 -0

toolbar.c dlls/comctl32/toolbar.c +3 -3

No files found.
--- a/dlls/comctl32/tests/toolbar.c
+++ b/dlls/comctl32/tests/toolbar.c
@@ -1649,6 +1649,11 @@ static void test_sizes(void)
    ok(rect.top == 0, "rect.top = %d\n", rect.top);
    ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom);

+    rebuild_toolbar_ex(&hToolbar, WS_EX_DLGMODALFRAME);
+    GetClientRect(hToolbar, &rect);
+    ok(rect.top == 0, "rect.top = %d\n", rect.top);
+    ok(rect.bottom == 26, "rect.bottom = %d\n", rect.bottom);
+
    free_tbsize_results();
    DestroyWindow(hToolbar);
 }

--- a/dlls/comctl32/toolbar.c
+++ b/dlls/comctl32/toolbar.c
@@ -3104,9 +3104,9 @@ TOOLBAR_AutoSize (TOOLBAR_INFO *infoPtr)

        if (infoPtr->dwStyle & CCS_NOPARENTALIGN)
            uPosFlags |= SWP_NOMOVE;
-    
-        if (!(infoPtr->dwStyle & CCS_NODIVIDER))
-            cy += GetSystemMetrics(SM_CYEDGE);
+
+        if (!(infoPtr->dwStyle & CCS_NOMOVEY) && !(infoPtr->dwStyle & CCS_NODIVIDER))
+            y += GetSystemMetrics(SM_CYEDGE);

        x += border.left;
        y += border.top;