From 637c52abf81512406d0f157357d961e72628f1da Mon Sep 17 00:00:00 2001
From: okan <okan>
Date: Tue, 23 Oct 2012 15:50:15 +0000
Subject: [PATCH] treat menu width the same as the height is treated when
 deciding its max size and location; partially from a diff from Alexander
 Polakov.

---
 menu.c | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/menu.c b/menu.c
index 4090921..7a64cb2 100644
--- a/menu.c
+++ b/menu.c
@@ -358,10 +358,12 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq,
 	xsave = mc->x;
 	ysave = mc->y;
 
-	if (mc->x < xmin)
-		mc->x = xmin;
-	else if (mc->x + mc->width >= xmax)
+	if (mc->x + mc->width >= xmax)
 		mc->x = xmax - mc->width;
+	if (mc->x < xmin) {
+		mc->x = xmin;
+		mc->width = xmax - xmin;
+	}
 
 	if (mc->y + dy >= ymax)
 		mc->y = ymax - dy;