summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJan D <jan.h.d@swipnet.se>2014-12-22 11:04:24 +0100
committerJan D <jan.h.d@swipnet.se>2014-12-22 11:04:24 +0100
commit8e818d17d2bada8cc2f2eda438f70014fd40939f (patch)
tree4a83d6ffc1346db7ae7ae4b10928857bf0daa1d1 /src
parent749813e9d4a844384e0450f6f7f88484b15e348a (diff)
downloademacs-8e818d17d2bada8cc2f2eda438f70014fd40939f.tar.gz
Keep maximized when going fullscreen.
Author: Fixes: Bug#19427 * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert when going to fullscreen (Bug#19427).
Diffstat (limited to 'src')
-rw-r--r--src/ChangeLog5
-rw-r--r--src/xterm.c8
2 files changed, 8 insertions, 5 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d6de89a9d50..9aeb8f26152 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2014-12-22 Jan Djärv <jan.h.d@swipnet.se>
+
+ * xterm.c (do_ewmh_fullscreen): Don't remove maximized_horz/vert
+ when going to fullscreen (Bug#0x180004f).
+
2014-12-18 Eli Zaretskii <eliz@gnu.org>
* window.c (Fwindow_body_width): Doc fix. (Bug#19395)
diff --git a/src/xterm.c b/src/xterm.c
index b6430ad11b0..ec1cad35fdd 100644
--- a/src/xterm.c
+++ b/src/xterm.c
@@ -8371,11 +8371,9 @@ do_ewmh_fullscreen (struct frame *f)
switch (f->want_fullscreen)
{
case FULLSCREEN_BOTH:
- if (cur == FULLSCREEN_WIDTH || cur == FULLSCREEN_MAXIMIZED
- || cur == FULLSCREEN_HEIGHT)
- set_wm_state (frame, 0, dpyinfo->Xatom_net_wm_state_maximized_horz,
- dpyinfo->Xatom_net_wm_state_maximized_vert);
- set_wm_state (frame, 1, dpyinfo->Xatom_net_wm_state_fullscreen, None);
+ if (cur != FULLSCREEN_BOTH)
+ set_wm_state (frame, 1, dpyinfo->Xatom_net_wm_state_fullscreen,
+ None);
break;
case FULLSCREEN_WIDTH:
if (cur == FULLSCREEN_BOTH || cur == FULLSCREEN_HEIGHT