From 71f8651be40544b3509ecefb35bd644e3ec791af Mon Sep 17 00:00:00 2001
From: oga
Date: Tue, 25 Aug 2009 01:32:40 +0000
Subject: Instead of messing around everytime we do a resize, just clamp the
 resize increments to a minimum of one, and use it unconditionally.

"you've convinced me, do it!" okan@
---
 client.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

(limited to 'client.c')

diff --git a/client.c b/client.c
index 70287ae..b9aaf66 100644
--- a/client.c
+++ b/client.c
@@ -15,7 +15,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $Id: client.c,v 1.62 2009/08/25 01:26:09 okan Exp $
+ * $Id: client.c,v 1.63 2009/08/25 01:32:40 oga Exp $
  */
 
 #include "headers.h"
@@ -685,6 +685,9 @@ client_getsizehints(struct client_ctx *cc)
 		cc->geom.incw = cc->size->width_inc;
 		cc->geom.inch = cc->size->height_inc;
 	}
+	cc->geom.incw = MAX(1, cc->geom.incw);
+	cc->geom.inch = MAX(1, cc->geom.inch);
+
 	if (cc->size->flags & PAspect) {
 		if (cc->size->min_aspect.x > 0) 
 			cc->geom.mina = (float)cc->size->min_aspect.y /
@@ -725,10 +728,8 @@ client_applysizehints(struct client_ctx *cc)
 	}
 
 	/* adjust for increment value */
-	if (cc->geom.incw)
-		cc->geom.width -= cc->geom.width % cc->geom.incw;
-	if (cc->geom.inch)
-		cc->geom.height -= cc->geom.height % cc->geom.inch;
+	cc->geom.width -= cc->geom.width % cc->geom.incw;
+	cc->geom.height -= cc->geom.height % cc->geom.inch;
 
 	/* restore base dimensions */
 	cc->geom.width += cc->geom.basew;
-- 
cgit v1.2.3-2-gb3c3