[hackers] [dwm] merge || Anselm R Garbe

changeset: 1470:28fe7661aa15
tag: tip
parent: 1469:40da5c7d1ae9
parent: 1468:654a2e8064ae
user: Anselm R Garbe <anselm_AT_garbe.us>
date: Sat Jul 18 11:28:31 2009 +0100
description:
merge

diff -r 40da5c7d1ae9 -r 28fe7661aa15 config.mk
--- a/config.mk Sat Jul 18 11:28:03 2009 +0100
+++ b/config.mk Sat Jul 18 11:28:31 2009 +0100
@@ -1,5 +1,5 @@
 # dwm version
-VERSION = 5.6
+VERSION = 5.7
 
 # Customize below to fit your system
 
diff -r 40da5c7d1ae9 -r 28fe7661aa15 dwm.c
--- a/dwm.c Sat Jul 18 11:28:03 2009 +0100
+++ b/dwm.c Sat Jul 18 11:28:31 2009 +0100
@@ -350,9 +350,9 @@
                 /* 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 @@
         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;
Received on Sat Jul 18 2009 - 09:28:48 UTC