[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] trunk r117602: Fix some issues with setting the frame heig
From: |
Martin Rudalics |
Subject: |
[Emacs-diffs] trunk r117602: Fix some issues with setting the frame height. |
Date: |
Mon, 28 Jul 2014 17:03:43 +0000 |
User-agent: |
Bazaar (2.6b2) |
------------------------------------------------------------
revno: 117602
revision-id: address@hidden
parent: address@hidden
committer: martin rudalics <address@hidden>
branch nick: trunk
timestamp: Mon 2014-07-28 19:03:23 +0200
message:
Fix some issues with setting the frame height.
* frame.c (x_set_frame_parameters): Revert part of 2014-07-24
change that added the top margin height to the requested height
and revert (undocumented) part of 2014-07-28 change that changed
the logic of whether a size change occurred.
modified:
src/ChangeLog changelog-20091113204419-o5vbwnq5f7feedwu-1438
src/frame.c frame.c-20091113204419-o5vbwnq5f7feedwu-243
=== modified file 'src/ChangeLog'
--- a/src/ChangeLog 2014-07-28 14:50:55 +0000
+++ b/src/ChangeLog 2014-07-28 17:03:23 +0000
@@ -1,3 +1,10 @@
+2014-07-28 Martin Rudalics <address@hidden>
+
+ * frame.c (x_set_frame_parameters): Revert part of 2014-07-24
+ change that added the top margin height to the requested height
+ and revert (undocumented) part of 2014-07-28 change that changed
+ the logic of whether a size change occurred.
+
2014-07-28 Eli Zaretskii <address@hidden>
* .gdbinit (xwindow): The members total_cols, total_lines,
=== modified file 'src/frame.c'
--- a/src/frame.c 2014-07-28 08:07:55 +0000
+++ b/src/frame.c 2014-07-28 17:03:23 +0000
@@ -3116,9 +3116,7 @@
else if (EQ (prop, Qheight) && RANGED_INTEGERP (0, val, INT_MAX))
{
height_change = 1;
- /* Add menu and tool bar lines to correctly resize F pixelwise. */
- height
- = (XFASTINT (val) + FRAME_TOP_MARGIN (f)) * FRAME_LINE_HEIGHT (f);
+ height = XFASTINT (val) * FRAME_LINE_HEIGHT (f);
}
else if (EQ (prop, Qtop))
top = val;
@@ -3200,9 +3198,10 @@
XSETFRAME (frame, f);
- if (((width_change && width != FRAME_TEXT_WIDTH (f))
- || (height_change && height != FRAME_TEXT_HEIGHT (f)))
- && (f->new_height || f->new_width))
+ if ((width_change || height_change)
+ && (width != FRAME_TEXT_WIDTH (f)
+ || height != FRAME_TEXT_HEIGHT (f)
+ || f->new_height || f->new_width))
{
/* If necessary provide default values for HEIGHT and WIDTH. Do
that here since otherwise a size change implied by an
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Emacs-diffs] trunk r117602: Fix some issues with setting the frame height.,
Martin Rudalics <=