procyberian/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

When changing frame sizes round before applying new sizes. (Bug#9723)

Browse source 
* dispnew.c (change_frame_size_1): Calculate new_frame_total_cols
after rounding frame sizes.  (Bug#9723)
This commit is contained in:
Martin Rudalics 2012-02-04 12:29:29 +01:00
parent 6283a7d3f4
commit 3b95a6f950
2 changed files with 16 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/ChangeLog
View file

@ -1,3 +1,8 @@
2012-02-04 Martin Rudalics <rudalics@gmx.at>
* dispnew.c (change_frame_size_1): Calculate new_frame_total_cols
after rounding frame sizes. (Bug#9723)
2012-02-04 Eli Zaretskii <eliz@gnu.org>
* keyboard.c (adjust_point_for_property): Don't position point

19
src/dispnew.c
View file

@ -5761,19 +5761,22 @@ change_frame_size_1 (register struct frame *f, int newheight, int newwidth, int
if (newwidth == 0)
newwidth = FRAME_COLS (f);
/* Compute width of windows in F.
This is the width of the frame without vertical scroll bars. */
new_frame_total_cols = FRAME_TOTAL_COLS_ARG (f, newwidth);
/* Compute width of windows in F. */
/* Round up to the smallest acceptable size. */
check_frame_size (f, &newheight, &newwidth);
/* This is the width of the frame with vertical scroll bars and fringe
columns. Do this after rounding - see discussion of bug#9723. */
new_frame_total_cols = FRAME_TOTAL_COLS_ARG (f, newwidth);
/* If we're not changing the frame size, quit now. */
/* Frame width may be unchanged but the text portion may change, for example,
fullscreen and remove/add scroll bar. */
/* Frame width may be unchanged but the text portion may change, for
example, fullscreen and remove/add scroll bar. */
if (newheight == FRAME_LINES (f)
&& newwidth == FRAME_COLS (f) // text portion unchanged
&& new_frame_total_cols == FRAME_TOTAL_COLS (f)) // frame width unchanged
/* Text portion unchanged? */
&& newwidth == FRAME_COLS (f)
/* Frame width unchanged? */
&& new_frame_total_cols == FRAME_TOTAL_COLS (f))
return;
BLOCK_INPUT;