# HG changeset patch
# User Anselm R Garbe <garbeam@gmail.com>
# Date 1213698018 -3600
# Node ID 06eb9644e2dad7667d97495eb7d7bc62aa0429e8
# Parent  226e616bc12308edbddf77756c671edd1e006c02# Parent  f4ed75c5e2ef4b035a4c66a60c939f8b69e64076
branch merge

diff -r f4ed75c5e2ef -r 06eb9644e2da config.def.h
--- a/config.def.h	Sun Jun 15 23:27:08 2008 +0200
+++ b/config.def.h	Tue Jun 17 11:20:18 2008 +0100
@@ -27,8 +27,8 @@
 };
 
 /* layout(s) */
-static float mfact           = 0.55;
-static Bool resizehints       = False;     /* False means respect size hints in tiled resizals */
+static float mfact      = 0.55;
+static Bool resizehints = True; /* False means respect size hints in tiled resizals */
 
 static Layout layouts[] = {
 	/* symbol     arrange function */
diff -r f4ed75c5e2ef -r 06eb9644e2da dwm.c
--- a/dwm.c	Sun Jun 15 23:27:08 2008 +0200
+++ b/dwm.c	Tue Jun 17 11:20:18 2008 +0100
@@ -913,7 +913,8 @@
 		if(c->y + c->h + 2 * c->bw > sy + sh)
 			c->y = sy + sh - c->h - 2 * c->bw;
 		c->x = MAX(c->x, sx);
-		c->y = MAX(c->y, by == 0 ? bh : sy);
+		/* only fix client y-offset, if the client center might cover the bar */
+		c->y = MAX(c->y, ((by == 0) && (c->x + (c->w / 2) >= wx) && (c->x + (c->w / 2) < wx + ww)) ? bh : sy);
 		c->bw = borderpx;
 	}
 
@@ -1093,11 +1094,11 @@
 
 		w = MAX(w, c->minw);
 		h = MAX(h, c->minh);
-		
-		if (c->maxw)
+
+		if(c->maxw)
 			w = MIN(w, c->maxw);
 
-		if (c->maxh)
+		if(c->maxh)
 			h = MIN(h, c->maxh);
 	}
 	if(w <= 0 || h <= 0)