[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] /srv/bzr/emacs/trunk r111590: Fix dimensions of maximized
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] /srv/bzr/emacs/trunk r111590: Fix dimensions of maximized frame on MS-Windows. |
Date: |
Wed, 23 Jan 2013 18:52:05 +0200 |
User-agent: |
Bazaar (2.5.0) |
------------------------------------------------------------
revno: 111590
committer: Eli Zaretskii <address@hidden>
branch nick: trunk
timestamp: Wed 2013-01-23 18:52:05 +0200
message:
Fix dimensions of maximized frame on MS-Windows.
src/w32term.c (w32fullscreen_hook): Account correctly for the screen
real estate used for the tool bar, the menu bar, and scroll bar.
modified:
src/ChangeLog
src/w32term.c
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2013-01-23 14:49:54 +0000
+++ b/src/ChangeLog 2013-01-23 16:52:05 +0000
@@ -1,3 +1,8 @@
+2013-01-23 Eli Zaretskii <address@hidden>
+
+ * w32term.c (w32fullscreen_hook): Account correctly for the screen
+ real estate used for the tool bar and the menu bar.
+
2013-01-23 Dmitry Antipov <address@hidden>
* insdel.c (prepare_to_modify_buffer): Force redisplay if
=== modified file 'src/w32term.c'
--- a/src/w32term.c 2013-01-09 15:07:01 +0000
+++ b/src/w32term.c 2013-01-23 16:52:05 +0000
@@ -5674,24 +5674,33 @@
switch (f->want_fullscreen)
{
- /* No difference between these two when there is no WM */
case FULLSCREEN_MAXIMIZED:
- PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, 0xf030, 0);
+ PostMessage (FRAME_W32_WINDOW (f), WM_SYSCOMMAND, SC_MAXIMIZE, 0);
break;
case FULLSCREEN_BOTH:
- height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height) - 2;
- width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width);
+ height =
+ FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
+ - XINT (Ftool_bar_lines_needed (selected_frame))
+ + (NILP (Vmenu_bar_mode) ? 1 : 0);
+ width =
+ FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width)
+ - FRAME_SCROLL_BAR_COLS (f);
left_pos = workarea_rect.left;
top_pos = workarea_rect.top;
break;
case FULLSCREEN_WIDTH:
- width = FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width);
+ width =
+ FRAME_PIXEL_WIDTH_TO_TEXT_COLS (f, pixel_width)
+ - FRAME_SCROLL_BAR_COLS (f);
if (normal_height > 0)
height = normal_height;
left_pos = workarea_rect.left;
break;
case FULLSCREEN_HEIGHT:
- height = FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height) - 2;
+ height =
+ FRAME_PIXEL_HEIGHT_TO_TEXT_LINES (f, pixel_height)
+ - XINT (Ftool_bar_lines_needed (selected_frame))
+ + (NILP (Vmenu_bar_mode) ? 1 : 0);
if (normal_width > 0)
width = normal_width;
top_pos = workarea_rect.top;
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] /srv/bzr/emacs/trunk r111590: Fix dimensions of maximized frame on MS-Windows.,
Eli Zaretskii <=