From 0e7e9a135e9044407ba4e8bb41bb531cc4e31048 Mon Sep 17 00:00:00 2001 From: Martin Duquesnoy Date: Sun, 15 Jan 2012 16:16:39 +0100 Subject: [PATCH] Fix check of 2 parents client geos: using temporary geo instead of original in case of manual locking resize --- src/client.c | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/client.c b/src/client.c index 5010f48..bcd0a25 100644 --- a/src/client.c +++ b/src/client.c @@ -1116,7 +1116,7 @@ _fac_resize(struct client *c, enum position p, int fac) SLIST_FOREACH(cc, &c->tag->clients, tnext) cc->ttgeo = cc->tgeo; - if(GEO_CHECK2(c->geo, gc->geo, p)) + if(GEO_CHECK2(c->tgeo, gc->tgeo, p)) { _fac_apply(c, p, fac); _fac_apply(gc, rp, -fac); @@ -1245,19 +1245,19 @@ client_fac_hint(struct client *c) int w = c->sizeh[MINW] + c->border + c->border; int h = c->sizeh[MINH] + c->tbarw + c->border; - if(c->geo.w < w) - _fac_resize(c, Left, (w - c->geo.w)); - if(c->tgeo.w < w) - _fac_resize(c, Right, (w - c->tgeo.w)); - - client_apply_tgeo(c->tag); - if(c->geo.h < h) _fac_resize(c, Top, (h - c->geo.h)); if(c->tgeo.h < h) _fac_resize(c, Bottom, (h - c->tgeo.h)); client_apply_tgeo(c->tag); + + if(c->geo.w < w) + _fac_resize(c, Left, (w - c->geo.w)); + if(c->tgeo.w < w) + _fac_resize(c, Right, (w - c->tgeo.w)); + + client_apply_tgeo(c->tag); } void