merge r6571 from trunk

diff --git a/openbox/frame.c b/openbox/frame.c
index 0db84406b1cd90c995336cbd59075e7b12661b51..c9a15f9f323308c96f67189a3a09449b4f0893d1 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -446,12 +446,14 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                                       self->width - ob_rr_theme->grip_width *2,
                                       ob_rr_theme->paddingy + 1);
 
-                    XMoveWindow(ob_display, self->tltresize, 0, 0);
-                    XMoveWindow(ob_display, self->tllresize, 0, 0);
+                    XMoveWindow(ob_display, self->tltresize, self->bwidth, 0);
+                    XMoveWindow(ob_display, self->tllresize, self->bwidth, 0);
                     XMoveWindow(ob_display, self->trtresize,
-                                self->width - ob_rr_theme->grip_width, 0);
+                                self->bwidth + self->width -
+                                ob_rr_theme->grip_width, 0);
                     XMoveWindow(ob_display, self->trrresize,
-                                self->width - ob_rr_theme->paddingx - 1, 0);
+                                self->bwidth + self->width -
+                                ob_rr_theme->paddingx - 1, 0);
 
                     XMapWindow(ob_display, self->topresize);
                     XMapWindow(ob_display, self->tltresize);