Skip to content

W
wine-winehq
Commit 3979f4a4 authored by Piotr Caban's avatar Piotr Caban Committed by Alexandre Julliard
Browse files
Options

user32: Simplify CreateWindow condition for setting WS_EX_WINDOWEDGE style.

Signed-off-by: 's avatarPiotr Caban <piotr@codeweavers.com> Signed-off-by: 's avatarAlexandre Julliard <julliard@winehq.org>
parent 08303d9b
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 9 deletions
dlls/user32/win.c
View file @ 3979f4a4
...@@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module, ...@@ -1653,16 +1653,9 @@ HWND WIN_CreateWindowEx( CREATESTRUCTW *cs, LPCWSTR className, HINSTANCE module,
} }
/* WS_EX_WINDOWEDGE depends on some other styles */ /* 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; 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))) if (!(wndPtr->dwStyle & (WS_CHILD | WS_POPUP)))
wndPtr->flags |= WIN_NEED_SIZE; wndPtr->flags |= WIN_NEED_SIZE;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment