From: Anselm R Garbe <anselm@garbe.us>
Date: Sat, 18 Jul 2009 10:28:31 +0000 (+0100)
Subject: merge
X-Git-Url: https://jasonwoof.com/gitweb/?p=dwm.git;a=commitdiff_plain;h=dfecd4619074e305e2107b5676bd0486bbb78a8c;hp=5bc4db0f7606f098a9d7309fef080f4e95ebf2f1

merge
---

diff --git a/config.mk b/config.mk
index 3fcfd2f..086424d 100644
--- a/config.mk
+++ b/config.mk
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.6
+VERSION = 5.7
 
 # Customize below to fit your system
 
diff --git a/dwm.c b/dwm.c
index 71d7e63..e22ea7a 100644
--- a/dwm.c
+++ b/dwm.c
@@ -350,9 +350,9 @@ applysizehints(Client *c, int *x, int *y, int *w, int *h, Bool interact) {
 		/* adjust for aspect limits */
 		if(c->mina > 0 && c->maxa > 0) {
 			if(c->maxa < (float)*w / *h)
-				*w = *h * c->maxa;
+				*w = *h * c->maxa + 0.5;
 			else if(c->mina < (float)*h / *w)
-				*h = *w * c->mina;
+				*h = *w * c->mina + 0.5;
 		}
 		if(baseismin) { /* increment calculation requires this */
 			*w -= c->basew;
@@ -1807,8 +1807,8 @@ updatesizehints(Client *c) {
 	else
 		c->minw = c->minh = 0;
 	if(size.flags & PAspect) {
-		c->mina = (float)size.min_aspect.y / (float)size.min_aspect.x;
-		c->maxa = (float)size.max_aspect.x / (float)size.max_aspect.y;
+		c->mina = (float)size.min_aspect.y / size.min_aspect.x;
+		c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
 	}
 	else
 		c->maxa = c->mina = 0.0;