comment out the applications example

[chaz/openbox] / openbox / frame.c

diff --git a/openbox/frame.c b/openbox/frame.c
index a3e6fb57b6e16fcf0401982c77ccf9d4f71e298c..ba452166bc12c67962726a2058202ab687e921d7 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);
@@ -1205,7 +1207,7 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
        is fully maximized, then treat it like they clicked in the
        button that is there */
     if (self->max_horz && self->max_vert &&
-        (win == self->title ||
+        (win == self->title || win == self->titletop ||
          win == self->titleleft || win == self->titletopleft ||
          win == self->titleright || win == self->titletopright))
     {
@@ -1221,6 +1223,9 @@ ObFrameContext frame_context(ObClient *client, Window win, gint x, gint y)
         /* title is a border width in from the edge */
         if (win == self->title)
             fx += self->bwidth;
+        /* titletop is a bit to the right */
+        else if (win == self->titletop)
+            fx += ob_rr_theme->grip_width + self->bwidth;
         /* titletopright is way to the right edge */
         else if (win == self->titletopright)
             fx += self->area.width - (ob_rr_theme->grip_width + self->bwidth);
@@ -1247,6 +1252,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;