user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.

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

user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.
3979f4a4 · Piotr Caban · Alexandre Julliard · 08303d9b · 3979f4a4
Commit 3979f4a4 authored Oct 07, 2021 by Piotr Caban Committed by Alexandre Julliard Oct 07, 2021
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 9 deletions

win.c dlls/user32/win.c +2 -9

No files found.
--- a/dlls/user32/win.c
+++ b/dlls/user32/win.c
@@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
    }

    /* WS_EX_WINDOWEDGE depends on some other styles */
-    if (wndPtr->dwExStyle & WS_EX_DLGMODALFRAME)
+    if ((wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME)) &&
+            !(wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))
        wndPtr->dwExStyle |= WS_EX_WINDOWEDGE;
-    else if (wndPtr->dwStyle & (WS_DLGFRAME | WS_THICKFRAME))
-    {
-        if (!((wndPtr->dwExStyle & WS_EX_STATICEDGE) &&
-            (wndPtr->dwStyle & (WS_CHILD | WS_POPUP))))
-            wndPtr->dwExStyle |= WS_EX_WINDOWEDGE;
-    }
-    else
-        wndPtr->dwExStyle &= ~WS_EX_WINDOWEDGE;

    if (!(wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))
        wndPtr->flags |= WIN_NEED_SIZE;