1 files changed, 16 insertions, 27 deletions

diff --git a/layout-manual.c b/layout-manual.c
index eee21d41..7edce667 100644
--- a/layout-manual.c
+++ b/layout-manual.c
@@ -26,7 +26,7 @@ void
 layout_manual_v_refresh(struct window *w, unused int active_only)
 {
 	struct window_pane	*wp;
-	u_int			 npanes, canfit, total;
+	u_int			 npanes, total, height;
 	int			 left;
 
 	if (active_only)
@@ -35,34 +35,25 @@ layout_manual_v_refresh(struct window *w, unused int active_only)
 	if (TAILQ_EMPTY(&w->panes))
 		return;
 
-	/* Clear hidden flags. */
-	TAILQ_FOREACH(wp, &w->panes, entry)
-	    	wp->flags &= ~PANE_HIDDEN;
-
 	/* Check the new size. */
 	npanes = window_count_panes(w);
 	if (w->sy <= PANE_MINIMUM * npanes) {
-		/* How many can we fit? */
-		canfit = w->sy / PANE_MINIMUM;
-		if (canfit == 0) {
-			/* None. Just use this size for the first. */
-			TAILQ_FOREACH(wp, &w->panes, entry) {
-				if (wp == TAILQ_FIRST(&w->panes))
-					wp->sy = w->sy;
-				else
-					wp->flags |= PANE_HIDDEN;
-			}
-		} else {
-			/* >=1, set minimum for them all. */
-			TAILQ_FOREACH(wp, &w->panes, entry) {
-				if (canfit-- > 0)
-					wp->sy = PANE_MINIMUM - 1;
-				else
-					wp->flags |= PANE_HIDDEN;
-			}
-			/* And increase the first by the rest. */
-			TAILQ_FIRST(&w->panes)->sy += 1 + w->sy % PANE_MINIMUM;
+		/* 
+		 * Make the first pane the smaller of the minimum and total (it
+		 * must fit to be visible) and the rest the minimum size.
+		 */
+		height = PANE_MINIMUM;
+		if (height > w->sy)
+			height = w->sy + 1;
+		TAILQ_FOREACH(wp, &w->panes, entry) {
+			if (wp == TAILQ_FIRST(&w->panes))
+				wp->sy = height - 1;
+			else
+				wp->sy = PANE_MINIMUM - 1;
 		}
+		/* And increase the first by the rest if possible. */
+		if (w->sy >= PANE_MINIMUM)
+			TAILQ_FIRST(&w->panes)->sy += 1 + w->sy % PANE_MINIMUM;
 	} else {
 		/* In theory they will all fit. Find the current total. */
 		total = 0;
@@ -174,8 +165,6 @@ layout_manual_v_update_offsets(struct window *w)
 
 	yoff = 0;
 	TAILQ_FOREACH(wp, &w->panes, entry) {
-		if (wp->flags & PANE_HIDDEN)
-			continue;
 		wp->xoff = 0;
 		wp->yoff = yoff;
 		yoff += wp->sy + 1;