diff options
| author | Martin Rudalics | 2017-09-28 10:10:21 +0200 |
|---|---|---|
| committer | Martin Rudalics | 2017-09-28 10:10:21 +0200 |
| commit | 88a0dd71f10ffb63fba08c062e948551c3e876c2 (patch) | |
| tree | 0c6e948219a15a1110d9ec4856808d2aa7acaa42 /src | |
| parent | ce540f8a687672fade6eb91e64ddf86e1e868784 (diff) | |
| download | emacs-88a0dd71f10ffb63fba08c062e948551c3e876c2.tar.gz emacs-88a0dd71f10ffb63fba08c062e948551c3e876c2.zip | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/w32term.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/w32term.c b/src/w32term.c index a7a510b9ecb..d7ec40118f3 100644 --- a/src/w32term.c +++ b/src/w32term.c | |||
| @@ -6252,7 +6252,8 @@ w32fullscreen_hook (struct frame *f) | |||
| 6252 | 6252 | ||
| 6253 | if (FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH) | 6253 | if (FRAME_PREV_FSMODE (f) == FULLSCREEN_BOTH) |
| 6254 | { | 6254 | { |
| 6255 | SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW); | 6255 | if (!FRAME_UNDECORATED (f)) |
| 6256 | SetWindowLong (hwnd, GWL_STYLE, dwStyle | WS_OVERLAPPEDWINDOW); | ||
| 6256 | SetWindowPlacement (hwnd, &FRAME_NORMAL_PLACEMENT (f)); | 6257 | SetWindowPlacement (hwnd, &FRAME_NORMAL_PLACEMENT (f)); |
| 6257 | } | 6258 | } |
| 6258 | else if (FRAME_PREV_FSMODE (f) == FULLSCREEN_HEIGHT | 6259 | else if (FRAME_PREV_FSMODE (f) == FULLSCREEN_HEIGHT |
| @@ -6278,7 +6279,8 @@ w32fullscreen_hook (struct frame *f) | |||
| 6278 | 6279 | ||
| 6279 | w32_fullscreen_rect (hwnd, f->want_fullscreen, | 6280 | w32_fullscreen_rect (hwnd, f->want_fullscreen, |
| 6280 | FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect); | 6281 | FRAME_NORMAL_PLACEMENT (f).rcNormalPosition, &rect); |
| 6281 | SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW); | 6282 | if (!FRAME_UNDECORATED (f)) |
| 6283 | SetWindowLong (hwnd, GWL_STYLE, dwStyle & ~WS_OVERLAPPEDWINDOW); | ||
| 6282 | SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, | 6284 | SetWindowPos (hwnd, HWND_TOP, rect.left, rect.top, |
| 6283 | rect.right - rect.left, rect.bottom - rect.top, | 6285 | rect.right - rect.left, rect.bottom - rect.top, |
| 6284 | SWP_NOOWNERZORDER | SWP_FRAMECHANGED); | 6286 | SWP_NOOWNERZORDER | SWP_FRAMECHANGED); |