fix drawcontent=no resizing
This commit is contained in:
parent
cad10d8b6d
commit
564b727966
3 changed files with 20 additions and 7 deletions
|
@ -2437,8 +2437,11 @@ void client_configure_full(ObClient *self, gint x, gint y, gint w, gint h,
|
||||||
(resized && config_resize_redraw))));
|
(resized && config_resize_redraw))));
|
||||||
|
|
||||||
/* if the client is enlarging, then resize the client before the frame */
|
/* 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));
|
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 */
|
/* find the frame's dimensions and move/resize it */
|
||||||
if (self->decorations != fdecor || self->max_horz != fhorz)
|
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 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);
|
XResizeWindow(ob_display, self->window, w, h);
|
||||||
|
}
|
||||||
|
|
||||||
XFlush(ob_display);
|
XFlush(ob_display);
|
||||||
}
|
}
|
||||||
|
|
|
@ -442,11 +442,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved,
|
||||||
self->client->area.height +
|
self->client->area.height +
|
||||||
self->cbwidth_y * 2);
|
self->cbwidth_y * 2);
|
||||||
|
|
||||||
/* move and resize the plate */
|
/* move the plate */
|
||||||
XMoveResizeWindow(ob_display, self->plate,
|
XMoveWindow(ob_display, self->plate,
|
||||||
self->cbwidth_x, self->cbwidth_y,
|
self->cbwidth_x, self->cbwidth_y);
|
||||||
self->client->area.width,
|
|
||||||
self->client->area.height);
|
|
||||||
|
|
||||||
/* when the client has StaticGravity, it likes to move around. */
|
/* when the client has StaticGravity, it likes to move around. */
|
||||||
XMoveWindow(ob_display, self->client->window, 0, 0);
|
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);
|
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)
|
void frame_adjust_state(ObFrame *self)
|
||||||
{
|
{
|
||||||
framerender_frame(self);
|
framerender_frame(self);
|
||||||
|
|
|
@ -151,6 +151,7 @@ void frame_adjust_theme(ObFrame *self);
|
||||||
void frame_adjust_shape(ObFrame *self);
|
void frame_adjust_shape(ObFrame *self);
|
||||||
void frame_adjust_area(ObFrame *self, gboolean moved,
|
void frame_adjust_area(ObFrame *self, gboolean moved,
|
||||||
gboolean resized, gboolean fake);
|
gboolean resized, gboolean fake);
|
||||||
|
void frame_adjust_client_area(ObFrame *self);
|
||||||
void frame_adjust_state(ObFrame *self);
|
void frame_adjust_state(ObFrame *self);
|
||||||
void frame_adjust_focus(ObFrame *self, gboolean hilite);
|
void frame_adjust_focus(ObFrame *self, gboolean hilite);
|
||||||
void frame_adjust_title(ObFrame *self);
|
void frame_adjust_title(ObFrame *self);
|
||||||
|
|
Loading…
Reference in a new issue