aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEli Zaretskii2013-03-13 19:31:06 +0200
committerEli Zaretskii2013-03-13 19:31:06 +0200
commitc7ffccaf17d63cefd34bef0a9becc4e68df3b115 (patch)
treefc936df9760c95bbe90ecabe3bb1e8e2140c158e
parentffcd945ec5f57bcea1c7ebc6329981577baaae80 (diff)
downloademacs-c7ffccaf17d63cefd34bef0a9becc4e68df3b115.tar.gz
emacs-c7ffccaf17d63cefd34bef0a9becc4e68df3b115.zip
Fix bug #13937 with creating a maximized frame on MS-Windows.
src/w32term.c (w32_read_socket): If we Emacs frame is being activated, call w32fullscreen_hook, to make sure the new frame dimensions are in effect.
-rw-r--r--src/ChangeLog6
-rw-r--r--src/w32term.c12
2 files changed, 17 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 6c575946b25..ae6fe86f661 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
12013-03-13 Eli Zaretskii <eliz@gnu.org>
2
3 * w32term.c (w32_read_socket): If we Emacs frame is being
4 activated, call w32fullscreen_hook, to make sure the new frame
5 dimensions are in effect. (Bug#13937)
6
12013-03-13 Dmitry Antipov <dmantipov@yandex.ru> 72013-03-13 Dmitry Antipov <dmantipov@yandex.ru>
2 8
3 * xdisp.c (init_iterator): Simplify because both character and byte 9 * xdisp.c (init_iterator): Simplify because both character and byte
diff --git a/src/w32term.c b/src/w32term.c
index 6137d54c837..680ad668ab3 100644
--- a/src/w32term.c
+++ b/src/w32term.c
@@ -236,6 +236,7 @@ static void my_set_focus (struct frame *, HWND);
236#endif 236#endif
237static void my_set_foreground_window (HWND); 237static void my_set_foreground_window (HWND);
238static void my_destroy_window (struct frame *, HWND); 238static void my_destroy_window (struct frame *, HWND);
239static void w32fullscreen_hook (FRAME_PTR);
239 240
240#ifdef GLYPH_DEBUG 241#ifdef GLYPH_DEBUG
241static void x_check_font (struct frame *, struct font *); 242static void x_check_font (struct frame *, struct font *);
@@ -4717,7 +4718,16 @@ w32_read_socket (struct terminal *terminal,
4717 case WM_ACTIVATEAPP: 4718 case WM_ACTIVATEAPP:
4718 f = x_window_to_frame (dpyinfo, msg.msg.hwnd); 4719 f = x_window_to_frame (dpyinfo, msg.msg.hwnd);
4719 if (f) 4720 if (f)
4720 x_check_fullscreen (f); 4721 {
4722 /* If we are being activated, run the full-screen hook
4723 function, to actually install the required size in
4724 effect. This is because when the hook is run from
4725 x_set_fullscreen, the frame might not yet be visible,
4726 if that call is a result of make-frame. */
4727 if (msg.msg.wParam)
4728 w32fullscreen_hook (f);
4729 x_check_fullscreen (f);
4730 }
4721 check_visibility = 1; 4731 check_visibility = 1;
4722 break; 4732 break;
4723 4733