From 3c3fc81b6c61bb5ebe75b688cf02b8498c2211b0 Mon Sep 17 00:00:00 2001 From: Dana Jansens Date: Sun, 20 May 2007 22:10:42 +0000 Subject: [PATCH] fix iconify animation to deal with the new frame layouting --- openbox/frame.c | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/openbox/frame.c b/openbox/frame.c index 81a50fe2..3059bc49 100644 --- a/openbox/frame.c +++ b/openbox/frame.c @@ -629,10 +629,14 @@ void frame_adjust_area(ObFrame *self, gboolean moved, XUnmapWindow(ob_display, self->lgrip); XUnmapWindow(ob_display, self->rgrip); } - } else + } else { + XUnmapWindow(ob_display, self->lgrip); + XUnmapWindow(ob_display, self->rgrip); + XUnmapWindow(ob_display, self->handle); + } - if (self->bwidth && !self->max_horz) { + if (self->bwidth && self->leftb) { XMoveResizeWindow(ob_display, self->left, 0, self->bwidth + ob_rr_theme->grip_width, @@ -640,6 +644,12 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->client->area.height + self->size.top + self->size.bottom - ob_rr_theme->grip_width * 2); + + XMapWindow(ob_display, self->left); + } else + XUnmapWindow(ob_display, self->left); + + if (self->bwidth && self->rightb) { XMoveResizeWindow(ob_display, self->right, self->client->area.width + self->cbwidth_x * 2 + self->bwidth, @@ -649,12 +659,9 @@ void frame_adjust_area(ObFrame *self, gboolean moved, self->size.top + self->size.bottom - ob_rr_theme->grip_width * 2); - XMapWindow(ob_display, self->left); XMapWindow(ob_display, self->right); - } else { - XUnmapWindow(ob_display, self->left); + } else XUnmapWindow(ob_display, self->right); - } /* move and resize the inner border window which contains the plate */ @@ -1454,8 +1461,8 @@ static gboolean frame_animate_iconify(gpointer p) /* start where the frame is supposed to be */ x = self->area.x; y = self->area.y; - w = self->area.width - self->bwidth * 2; - h = self->area.height - self->bwidth * 2; + w = self->area.width; + h = self->area.height; } else { /* start at the icon */ x = iconx; @@ -1508,8 +1515,7 @@ void frame_end_iconify_animation(ObFrame *self) XMoveResizeWindow(ob_display, self->window, self->area.x, self->area.y, - self->area.width - self->bwidth * 2, - self->area.height - self->bwidth * 2); + self->area.width, self->area.height); XFlush(ob_display); } -- 2.45.2