Synchronise with v3.11-rc1

[kconfig-frontends] / libs / lxdialog / inputbox.c

diff --git a/libs/lxdialog/inputbox.c b/libs/lxdialog/inputbox.c
index 21404a04d7c34dc37d9f29ffe804b6abeb3f2a62..447a582198c9bc70c37c4d2d034b128b5a62080d 100644 (file)
--- a/libs/lxdialog/inputbox.c
+++ b/libs/lxdialog/inputbox.c
@@ -56,14 +56,14 @@ int dialog_inputbox(const char *title, const char *prompt, int height, int width
                strcpy(instr, init);
 
 do_resize:
-       if (getmaxy(stdscr) <= (height - 2))
+       if (getmaxy(stdscr) <= (height - INPUTBOX_HEIGTH_MIN))
                return -ERRDISPLAYTOOSMALL;
-       if (getmaxx(stdscr) <= (width - 2))
+       if (getmaxx(stdscr) <= (width - INPUTBOX_WIDTH_MIN))
                return -ERRDISPLAYTOOSMALL;
 
        /* center dialog box on screen */
-       x = (COLS - width) / 2;
-       y = (LINES - height) / 2;
+       x = (getmaxx(stdscr) - width) / 2;
+       y = (getmaxy(stdscr) - height) / 2;
 
        draw_shadow(stdscr, y, x, height, width);