fix drawcontent=no resizing
Dana Jansens danakj@orodu.net
3 files changed,
20 insertions(+),
7 deletions(-)
M
openbox/client.c
→
openbox/client.c
@@ -2437,8 +2437,11 @@ (user && (final ||
(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 @@ FALSE, StructureNotifyMask, &event);
} /* 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); }
M
openbox/frame.c
→
openbox/frame.c
@@ -442,11 +442,9 @@ self->cbwidth_x * 2,
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);@@ -509,6 +507,13 @@ }
if (resized && (self->decorations & OB_FRAME_DECOR_TITLEBAR)) XResizeWindow(ob_display, self->label, self->label_width, 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)
M
openbox/frame.h
→
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);