some minor fixes

[dwm.git] / dwm.c

diff --git a/dwm.c b/dwm.c
index 235940e..2f1dbf8 100644 (file)
--- a/dwm.c
+++ b/dwm.c
@@ -342,10 +342,8 @@ buttonpress(XEvent *e) {
                        restack();
                        movemouse(c);
                }
-               else if(ev->button == Button2) {
-                       if(lt->arrange && c->isfloating)
-                               togglefloating(NULL);
-               }
+               else if(ev->button == Button2)
+                       togglefloating(NULL);
                else if(ev->button == Button3 && !c->isfixed) {
                        restack();
                        resizemouse(c);
@@ -1673,9 +1671,9 @@ updategeom(void) {
                wh = showbar ? sh - bh : sh;
        }
 
-       /* bar geometry*/
+       /* bar geometry */
        bx = wx;
-       by = showbar ? (topbar ? 0 : wy + wh) : -bh;
+       by = showbar ? (topbar ? wy - bh : wy + wh) : -bh;
        bw = ww;
 
        /* update layout geometries */