diff src/redisplay-x.c @ 215:1f0dabaa0855 r20-4b6

Import from CVS: tag r20-4b6
author cvs
date Mon, 13 Aug 2007 10:07:35 +0200
parents 78f53ef88e17
children d44af0c54775
line wrap: on
line diff
--- a/src/redisplay-x.c	Mon Aug 13 10:06:48 2007 +0200
+++ b/src/redisplay-x.c	Mon Aug 13 10:07:35 2007 +0200
@@ -2165,13 +2165,17 @@
 
   x = FRAME_LEFT_BORDER_START (f);
   width = (FRAME_PIXWIDTH (f) - FRAME_REAL_LEFT_TOOLBAR_WIDTH (f) -
-	   FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f));
+	   FRAME_REAL_RIGHT_TOOLBAR_WIDTH (f) -
+	   2 * FRAME_REAL_LEFT_TOOLBAR_BORDER_WIDTH (f) -
+	   2 * FRAME_REAL_RIGHT_TOOLBAR_BORDER_WIDTH (f));
   /* #### This adjustment by 1 should be being done in the macros.
      There is some small differences between when the menubar is on
      and off that we still need to deal with. */
   y = FRAME_TOP_BORDER_START (f) - 1;
   height = (FRAME_PIXHEIGHT (f) - FRAME_REAL_TOP_TOOLBAR_HEIGHT (f) -
-	    FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f)) + 1;
+	    FRAME_REAL_BOTTOM_TOOLBAR_HEIGHT (f) -
+	    2 * FRAME_REAL_TOP_TOOLBAR_BORDER_WIDTH (f) -
+	    2 * FRAME_REAL_BOTTOM_TOOLBAR_BORDER_WIDTH (f)) + 1;
 
   XClearArea (dpy, x_win, x, y, width, height, False);