summaryrefslogtreecommitdiff
path: root/openbox
diff options
context:
space:
mode:
authorDana Jansens <danakj@orodu.net>2007-05-30 02:19:02 +0000
committerDana Jansens <danakj@orodu.net>2007-05-30 02:19:02 +0000
commit9a3464b8e3711a6f0e823b840576041f5d4d0b00 (patch)
treef125b9fd766a9ae69b90f6c452254d0332280b9f /openbox
parent5ed8f271862562e88cb60177c05f2c35d194bf68 (diff)
that change was a bug after all. mika was right!
Diffstat (limited to 'openbox')
-rw-r--r--openbox/client.c12
1 files changed, 8 insertions, 4 deletions
diff --git a/openbox/client.c b/openbox/client.c
index e1c814ce..8ba71172 100644
--- a/openbox/client.c
+++ b/openbox/client.c
@@ -2850,8 +2850,8 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
SIZE_SET(self->logical_size, logicalw, logicalh);
/* figure out if we moved or resized or what */
- moved = x != self->area.x || y != self->area.y;
- resized = w != self->area.width || h != self->area.height;
+ moved = (x != self->area.x || y != self->area.y);
+ resized = (w != self->area.width || h != self->area.height);
oldw = self->area.width;
oldh = self->area.height;
@@ -2917,8 +2917,12 @@ void client_configure(ObClient *self, gint x, gint y, gint w, gint h,
FALSE, StructureNotifyMask, &event);
}
- /* if the client is shrinking, then resize the frame before the client */
- if (send_resize_client && (w <= oldw && h <= oldh)) {
+ /* if the client is shrinking, then resize the frame before the client.
+
+ both of these resize sections may run, because the top one only resizes
+ in the direction that is growing
+ */
+ if (send_resize_client && (w <= oldw || h <= oldh)) {
frame_adjust_client_area(self->frame);
XResizeWindow(ob_display, self->window, w, h);
}