commit afb9828d57eb9a8a26ad8a927cfc42499883bca1
author Kristian Høgsberg <krh@bitplanet.net> Mon Oct 21 15:23:17 2013 -0700
committer Kristian Høgsberg <krh@bitplanet.net> Mon Oct 21 15:23:23 2013 -0700
tree 2c40016d93f59dd7bfc1df26e18f82880290dccc
parent fb08e4bdaa9d5c840c0d0d6b1200ce9fab9a93bf

window: Only clamp min size for windows with frame

Also fix width/height typo.

clients/window.c

diff --git a/clients/window.c b/clients/window.c
index e7c54d2..506357f 100644
--- a/clients/window.c
+++ b/clients/window.c
@@ -3741,14 +3741,14 @@
 	window->pending_allocation.height = height;
 
 	if (window->min_allocation.width == 0) {
-		if (width < min_width)
+		if (width < min_width && window->frame)
 			window->min_allocation.width = min_width;
 		else
 			window->min_allocation.width = width;
-		if (height < min_height)
+		if (height < min_height && window->frame)
 			window->min_allocation.height = min_height;
 		else
-			window->min_allocation.height = width;
+			window->min_allocation.height = height;
 	}
 
 	if (window->pending_allocation.width < window->min_allocation.width)