X-Git-Url: http://git.openbox.org/?p=dana%2Fopenbox.git;a=blobdiff_plain;f=openbox%2Fframe.c;h=24d3eb535a93ae3f3eaa428298df54585ffefa65;hp=48dda24eaa9880380d05b1ecc9bcc875cdb1a456;hb=8a26a5190ca8479b96261c9e896e88bd32f56d06;hpb=1869e4e830d08acd5f7801acd8910ce99806f53b;ds=inline

diff --git a/openbox/frame.c b/openbox/frame.c
index 48dda24..24d3eb5 100644
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -378,13 +378,22 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
 
         STRUT_SET(self->size,
                   self->cbwidth_l + (!self->max_horz ? self->bwidth : 0),
-                  self->cbwidth_t + self->bwidth,
+                  self->cbwidth_t +
+                  (!self->max_horz || !self->max_vert ? self->bwidth : 0),
                   self->cbwidth_r + (!self->max_horz ? self->bwidth : 0),
                   self->cbwidth_b +
                   (!self->max_horz || !self->max_vert ? self->bwidth : 0));
 
         if (self->decorations & OB_FRAME_DECOR_TITLEBAR)
             self->size.top += ob_rr_theme->title_height + self->bwidth;
+        else if (self->max_horz && self->max_vert) {
+            /* A maximized and undecorated window needs a small border on the
+               top of the window to let the user still undecorate/unmaximize the
+               window via the client menu. */
+            /* XXX This size should probably be a theme option. */
+            self->size.top += 1;
+        }
+
         if (self->decorations & OB_FRAME_DECOR_HANDLE &&
             ob_rr_theme->handle_height > 0)
         {