Commit 5dc4b8ca authored by Martin Rudalics's avatar Martin Rudalics
Browse files

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.
parent 2daa203c
2014-07-28 Martin Rudalics <rudalics@gmx.at>
* 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 <eliz@gnu.org>
* .gdbinit (xwindow): The members total_cols, total_lines,
......
......@@ -3116,9 +3116,7 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
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 @@ x_set_frame_parameters (struct frame *f, Lisp_Object alist)
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
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment