M client.c → client.c

@@ -201,8 +201,6 @@ c = emallocz(sizeof(Client));
 	c->win = w;
 	c->bx = c->fx = c->tx = wa->x;
 	c->by = c->fy = c->ty = wa->y;
-	if(c->fy < bh)
-		c->by = c->fy = c->ty += bh;
 	c->bw = c->fw = c->tw = wa->width;
 	c->fh = c->th = wa->height;
 	c->bh = bh;
@@ -211,6 +209,9 @@ diff = sw - c->fw;
 	c->fx = random() % (diff ? diff : 1);
 	diff = sh - c->fh - bh;
 	c->fy = random() % (diff ? diff : 1);
+
+	if(c->fy < bh)
+		c->by = c->fy = c->ty = bh;
 
 	c->border = 1;
 	c->proto = getproto(c->win);

M tag.c → tag.c

@@ -96,11 +96,17 @@ *c->y = sy + bh;
 				*c->w = mw - 2 * c->border;
 				*c->h = sh - 2 * c->border - bh;
 			}
-			else {
+			else if(h > bh) {
 				*c->x = sx + mw;
 				*c->y = sy + (i - 1) * h + bh;
 				*c->w = w - 2 * c->border;
 				*c->h = h - 2 * c->border;
+			}
+			else { /* fallback if h < bh */
+				*c->x = sx + mw;
+				*c->y = sy + bh;
+				*c->w = w - 2 * c->border;
+				*c->h = sh - 2 * c->border - bh;
 			}
 			resize(c, False, TopLeft);
 			i++;