From: Dana Jansens <danakj@orodu.net>
Date: Tue, 22 May 2007 15:43:49 +0000 (+0000)
Subject: merge r6748 from trunk
X-Git-Tag: openbox-3_3_992-RELEASE~12
X-Git-Url: http://git.openbox.org/?a=commitdiff_plain;h=8877b2ce9da5db0d6fe0e524b0f50e5633a20c2e;p=dana%2Fopenbox.git

merge r6748 from trunk
---

diff --git a/openbox/frame.c b/openbox/frame.c
index 18d922cc..0db84406 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -374,7 +374,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                 XMoveResizeWindow(ob_display, self->titletop,
                                   ob_rr_theme->grip_width + self->bwidth, 0,
                                   /* width + bwidth*2 - bwidth*2 - grips*2 */
-                                  self->width + ob_rr_theme->grip_width * 2,
+                                  self->width - ob_rr_theme->grip_width * 2,
                                   self->bwidth);
                 XMoveResizeWindow(ob_display, self->titletopleft,
                                   0, 0,
@@ -443,8 +443,7 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                     XMoveResizeWindow(ob_display, self->topresize,
                                       ob_rr_theme->grip_width + self->bwidth,
                                       0,
-                                      self->width - (ob_rr_theme->grip_width +
-                                                     self->bwidth) * 2,
+                                      self->width - ob_rr_theme->grip_width *2,
                                       ob_rr_theme->paddingy + 1);
 
                     XMoveWindow(ob_display, self->tltresize, 0, 0);