diff options
| author | Jan Djärv <jan.h.d@swipnet.se> | 2010-04-07 18:34:31 +0200 |
|---|---|---|
| committer | Jan Djärv <jan.h.d@swipnet.se> | 2010-04-07 18:34:31 +0200 |
| commit | f016f225d26e074eba8b7720a1f76574bee21d30 (patch) | |
| tree | 31223c5eb2dc3024895281af20911646c20468a9 /src/xterm.c | |
| parent | 64e692b56e84153d45b2c46d833dce14243f7c69 (diff) | |
| download | emacs-f016f225d26e074eba8b7720a1f76574bee21d30.tar.gz | |
Fix resizing for X and non-Gtk+ build. Bug #5848.
* 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.
Diffstat (limited to 'src/xterm.c')
| -rw-r--r-- | src/xterm.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/xterm.c b/src/xterm.c index fd09d6d4815..69940685ace 100644 --- a/src/xterm.c +++ b/src/xterm.c @@ -8933,11 +8933,9 @@ x_set_window_size_1 (f, change_gravity, cols, rows) compute_fringe_widths (f, 0); - pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols) - + 2*f->border_width; + pixelwidth = FRAME_TEXT_COLS_TO_PIXEL_WIDTH (f, cols); pixelheight = FRAME_TEXT_LINES_TO_PIXEL_HEIGHT (f, rows) - + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f) - + 2*f->border_width; + + FRAME_MENUBAR_HEIGHT (f) + FRAME_TOOLBAR_HEIGHT (f); if (change_gravity) f->win_gravity = NorthWestGravity; x_wm_set_size_hint (f, (long) 0, 0); |