Mercurial > emacs

diff src/xterm.c @ 107798:04b6d1cf4d69

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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.
author Jan D <jan.h.d@swipnet.se>
date Wed, 07 Apr 2010 13:39:26 +0200
parents 912a8c0c9a8a
children 74557d25410e
line wrap: on
line diff
--- a/src/xterm.c	Tue Apr 06 23:11:45 2010 -0700
+++ b/src/xterm.c	Wed Apr 07 13:39:26 2010 +0200
@@ -8931,11 +8931,9 @@
 
   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);