From c21d56e5a1c98eacb70f3197311232731ccf1a6f Mon Sep 17 00:00:00 2001 From: okan Date: Tue, 23 Oct 2012 15:32:38 +0000 Subject: [PATCH] Stop drawing when menu doesn't fit inside the screen; picked from a larger diff from Alexander Polakov. --- menu.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/menu.c b/menu.c index 29008e6..4090921 100644 --- a/menu.c +++ b/menu.c @@ -387,9 +387,14 @@ menu_draw(struct screen_ctx *sc, struct menu_ctx *mc, struct menu_q *menuq, TAILQ_FOREACH(mi, resultq, resultentry) { char *text = mi->print[0] != '\0' ? mi->print : mi->text; + int y = n * font_height(sc) + font_ascent(sc) + 1; + + /* Stop drawing when menu doesn't fit inside the screen. */ + if (mc->y + y > ymax) + break; font_draw(sc, text, MIN(strlen(text), MENU_MAXENTRY), - sc->menuwin, 0, n * font_height(sc) + font_ascent(sc) + 1); + sc->menuwin, 0, y); n++; }