fix drawcontent=no resizing

diff --git a/openbox/client.c b/openbox/client.c
index 4abff4c50984a5296b3ac540ba9e487d558e2304..3396796201c0b2bcb4e45f748a6777823cbffa62 100644 (file)
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2437,8 +2437,11 @@ void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h,
                                     (resized && config_resize_redraw))));
 
     /* if the client is enlarging, then resize the client before the frame */
-    if (send_resize_client && user && (w > oldw || h > oldh))
+    if (send_resize_client && user && (w > oldw || h > oldh)) {
         XResizeWindow(ob_display, self->window, MAX(w, oldw), MAX(h, oldh));
+        /* resize the plate to show the client padding color underneath */
+        frame_adjust_client_area(self->frame);
+    }
 
     /* find the frame's dimensions and move/resize it */
     if (self->decorations != fdecor || self->max_horz != fhorz)
@@ -2484,8 +2487,12 @@ void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h,
     }
 
     /* if the client is shrinking, then resize the frame before the client */
-    if (send_resize_client && (!user || (w <= oldw || h <= oldh)))
+    if (send_resize_client && (!user || (w <= oldw || h <= oldh))) {
+        /* resize the plate to show the client padding color underneath */
+        frame_adjust_client_area(self->frame);
+
         XResizeWindow(ob_display, self->window, w, h);
+    }
 
     XFlush(ob_display);
 }

diff --git a/openbox/frame.c b/openbox/frame.c
index f12dbfb2a72cd595faf5dc7db349f8e4bff6fdc6..8feef931b4200674586f94027a2d8b4ddc1c0b53 100644 (file)
--- a/openbox/frame.c
+++ b/openbox/frame.c
@@ -442,11 +442,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                               self->client->area.height +
                               self->cbwidth_y * 2);
 
-            /* move and resize the plate */
-            XMoveResizeWindow(ob_display, self->plate,
-                              self->cbwidth_x, self->cbwidth_y,
-                              self->client->area.width,
-                              self->client->area.height);
+            /* move the plate */
+            XMoveWindow(ob_display, self->plate,
+                        self->cbwidth_x, self->cbwidth_y);
 
             /* when the client has StaticGravity, it likes to move around. */
             XMoveWindow(ob_display, self->client->window, 0, 0);
@@ -511,6 +509,13 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
                       ob_rr_theme->label_height);
 }
 
+void frame_adjust_client_area(ObFrame *self)
+{
+    /* resize the plate */
+    XResizeWindow(ob_display, self->plate,
+                  self->client->area.width, self->client->area.height);
+}
+
 void frame_adjust_state(ObFrame *self)
 {
     framerender_frame(self);

diff --git a/openbox/frame.h b/openbox/frame.h
index 344c1530200394b6b48da7733016dce1395749c8..19bade78c73a22ded9c59398e181efc560d5dbd3 100644 (file)
--- a/openbox/frame.h
+++ b/openbox/frame.h
@@ -151,6 +151,7 @@ void frame_adjust_theme(ObFrame *self);
 void frame_adjust_shape(ObFrame *self);
 void frame_adjust_area(ObFrame *self, gboolean moved,
                        gboolean resized, gboolean fake);
+void frame_adjust_client_area(ObFrame *self);
 void frame_adjust_state(ObFrame *self);
 void frame_adjust_focus(ObFrame *self, gboolean hilite);
 void frame_adjust_title(ObFrame *self);