fix iconify animation to deal with the new frame layouting
Dana Jansens danakj@orodu.net
1 files changed,
16 insertions(+),
10 deletions(-)
jump to
M
openbox/frame.c
→
openbox/frame.c
@@ -629,10 +629,14 @@ } else {
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 @@ self->bwidth,
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 @@ self->client->area.height +
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 @@ if (time == 0 || iconifying) {
/* 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 @@ self->iconify_animation_going = 0;
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); }