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

Fix resizing for X and non-Gtk+ build. Bug #5848.

Browse source 
* frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
FRAME_LINE_TO_PIXEL_Y.

* xterm.c (x_set_window_size_1): Don't add border_width/height to
pixelwidth/height.
This commit is contained in:
Jan Djärv 2010-04-07 18:34:31 +02:00
parent 64e692b56e
commit f016f225d2
3 changed files with 12 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/ChangeLog
View file

@ -1,3 +1,11 @@
2010-04-07 Jan Djärv <jan.h.d@swipnet.se>
* frame.h (FRAME_TEXT_LINES_TO_PIXEL_HEIGHT): Don't use
FRAME_LINE_TO_PIXEL_Y.
* xterm.c (x_set_window_size_1): Don't add border_width/height to
pixelwidth/height.
2010-04-05 Chong Yidong <cyd@stupidchicken.com> 2010-04-05 Chong Yidong <cyd@stupidchicken.com>
* xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for * xdisp.c (prepare_menu_bars): Don't call ns_set_doc_edited for

4
src/frame.h
View file

@ -997,8 +997,8 @@ extern Lisp_Object selected_frame;
+ FRAME_INTERNAL_BORDER_WIDTH (f)) + FRAME_INTERNAL_BORDER_WIDTH (f))
#define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \ #define FRAME_TEXT_LINES_TO_PIXEL_HEIGHT(f, lines) \
(FRAME_LINE_TO_PIXEL_Y (f, lines) \ ((lines) * FRAME_LINE_HEIGHT (f) \
+ FRAME_INTERNAL_BORDER_WIDTH (f)) + 2 * FRAME_INTERNAL_BORDER_WIDTH (f))
/* Return the row/column (zero-based) of the character cell containing /* Return the row/column (zero-based) of the character cell containing

6
src/xterm.c
View file

@ -8933,11 +8933,9 @@ x_set_window_size_1 (f, change_gravity, cols, rows)
compute_fringe_widths (f, 0); compute_fringe_widths (f, 0);
pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols);
+ 2*f->border_width;
pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows)
+ FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f) + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f);
+ 2*f->border_width;
if (change_gravity) f->win_gravity = NorthWestGravity; if (change_gravity) f->win_gravity = NorthWestGravity;
x_wm_set_size_hint (f, (long) 0, 0); x_wm_set_size_hint (f, (long) 0, 0);