fix frame rendering to match layout fixes

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index a3e6fb57b6e16fcf0401982c77ccf9d4f71e298c..96e93ba0ad1612128bd7e8346b1cf396d97d5bf6 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);
@@ -1247,6 +1249,10 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
                     return self->rightmost;
             }
         }
+
+        /* there is no resizing maximized windows so make them the titlebar
+           context */
+        return OB_FRAME_CONTEXT_TITLEBAR;
     }
 
     if (win == self->window)            return OB_FRAME_CONTEXT_FRAME;