From e05bb598a0e301d6ff2c69ab60e635bc574f8299 Mon Sep 17 00:00:00 2001
From: okan
Date: Thu, 2 Jan 2014 22:49:10 +0000
Subject: calculate proper menu width/height on the first Expose event; 'jump'
 (while using gap) noticed by Christian Neukirchen

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

(limited to 'menu.c')

diff --git a/menu.c b/menu.c
index 0150729..b13872a 100644
--- a/menu.c
+++ b/menu.c
@@ -16,7 +16,7 @@
  * ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
  * OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
  *
- * $OpenBSD: menu.c,v 1.70 2013/12/17 16:10:43 okan Exp $
+ * $OpenBSD: menu.c,v 1.71 2014/01/02 22:49:10 okan Exp $
  */
 
 #include <sys/param.h>
@@ -392,13 +392,13 @@ menu_draw(struct menu_ctx *mc, struct menu_q *menuq, struct menu_q *resultq)
 		mc->x = xine.w - mc->width;
 	if (mc->x < xine.x) {
 		mc->x = xine.x;
-		mc->width = xine.w - xine.x;
+		mc->width = MIN(mc->width, (xine.w - xine.x));
 	}
 	if (mc->y + mc->height >= xine.h)
 		mc->y = xine.h - mc->height;
 	if (mc->y < xine.y) {
 		mc->y = xine.y;
-		mc->height = xine.h - xine.y;
+		mc->height = MIN(mc->height, (xine.h - xine.y));
 	}
 
 	if (mc->x != xsave || mc->y != ysave)
-- 
cgit v1.2.3-2-gb3c3