In w32fullscreen_hook don't add decorations to undecorated frames

* src/w32term.c (w32fullscreen_hook): Do not add (or try to
remove) decorations for undecorated frames.
This commit is contained in:
Martin Rudalics 2017-09-28 10:10:21 +02:00
parent ce540f8a68
commit 88a0dd71f1

View file

@ -6252,7 +6252,8 @@ w32fullscreen_hook (struct frame *f)
if (FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH) if (FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH)
{ {
SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW); if (!FRAME_UNDECORATED (f))
SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW);
SetWindowPlacement (hwnd, &FRAME_NORMAL_PLACEMENT (f)); SetWindowPlacement (hwnd, &FRAME_NORMAL_PLACEMENT (f));
} }
else if (FRAME_PREV_FSMODE (f) == FULLSCREEN_HEIGHT else if (FRAME_PREV_FSMODE (f) == FULLSCREEN_HEIGHT
@ -6278,7 +6279,8 @@ w32fullscreen_hook (struct frame *f)
w32_fullscreen_rect (hwnd, f->want_fullscreen, w32_fullscreen_rect (hwnd, f->want_fullscreen,
FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect); FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect);
SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW); if (!FRAME_UNDECORATED (f))
SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW);
SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top,
rect.right - rect.left, rect.bottom - rect.top, rect.right - rect.left, rect.bottom - rect.top,
SWP_NOOWNERZORDER | SWP_FRAMECHANGED); SWP_NOOWNERZORDER | SWP_FRAMECHANGED);