window: Only clamp min size for windows with frame

Also fix width/height typo.
This commit is contained in:
Kristian Høgsberg
2013-10-21 15:23:17 -07:00
parent fb08e4bdaa
commit afb9828d57
+3 -3
View File
@@ -3741,14 +3741,14 @@ window_schedule_resize(struct window *window, int width, int height)
window->pending_allocation.height = height; window->pending_allocation.height = height;
if (window->min_allocation.width == 0) { if (window->min_allocation.width == 0) {
if (width < min_width) if (width < min_width && window->frame)
window->min_allocation.width = min_width; window->min_allocation.width = min_width;
else else
window->min_allocation.width = width; window->min_allocation.width = width;
if (height < min_height) if (height < min_height && window->frame)
window->min_allocation.height = min_height; window->min_allocation.height = min_height;
else else
window->min_allocation.height = width; window->min_allocation.height = height;
} }
if (window->pending_allocation.width < window->min_allocation.width) if (window->pending_allocation.width < window->min_allocation.width)