Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 851f6657 authored by Sedat Dilek's avatar Sedat Dilek Committed by Yann E. MORIN
Browse files

kconfig/lxdialog: Add definitions for mininimum (re)size values 



Commit c8dc68ad ("kconfig/lxdialog: support resize") added support
for resizing, but forgot to collect all hardcoded values at one single
place.

Also add a definition for the check for a minimum screen/window size
of 80x19.

[ ChangeLog v3:
  * Rename MENU_{HEIGTH,WIDTH}_MIN -> MENUBOX_{HEIGTH,WIDTH}_MIN
  ChangeLog v2:
  * Rename WIN_{HEIGTH,WIDTH}_MIN -> WINDOW_{HEIGTH,WIDTH}_MIN
  * Mention the check for a minimum screen/window size in the changelog
  * Add a comment above the block of new definitions ]

Signed-off-by: default avatarSedat Dilek <sedat.dilek@gmail.com>
Acked-by: default avatarWang YanQing <udknight@gmail.com>
Tested-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
parent fbe98bb9

scripts/kconfig/lxdialog/checklist.c

+2 −2
Original line number Diff line number Diff line
@@ -132,9 +132,9 @@ int dialog_checklist(const char *title, const char *prompt, int height, 
	}



do_resize:

	if (getmaxy(stdscr) < (height + 6))

	if (getmaxy(stdscr) < (height + CHECKLIST_HEIGTH_MIN))

		return -ERRDISPLAYTOOSMALL;

	if (getmaxx(stdscr) < (width + 6))

	if (getmaxx(stdscr) < (width + CHECKLIST_WIDTH_MIN))

		return -ERRDISPLAYTOOSMALL;



	max_choice = MIN(list_height, item_count());

scripts/kconfig/lxdialog/dialog.h

+14 −0
Original line number Diff line number Diff line
@@ -200,6 +200,20 @@ int item_is_tag(char tag); 
int on_key_esc(WINDOW *win);

int on_key_resize(void);



/* minimum (re)size values */

#define CHECKLIST_HEIGTH_MIN 6	/* For dialog_checklist() */

#define CHECKLIST_WIDTH_MIN 6

#define INPUTBOX_HEIGTH_MIN 2	/* For dialog_inputbox() */

#define INPUTBOX_WIDTH_MIN 2

#define MENUBOX_HEIGTH_MIN 15	/* For dialog_menu() */

#define MENUBOX_WIDTH_MIN 65

#define TEXTBOX_HEIGTH_MIN 8	/* For dialog_textbox() */

#define TEXTBOX_WIDTH_MIN 8

#define YESNO_HEIGTH_MIN 4	/* For dialog_yesno() */

#define YESNO_WIDTH_MIN 4

#define WINDOW_HEIGTH_MIN 19	/* For init_dialog() */

#define WINDOW_WIDTH_MIN 80



int init_dialog(const char *backtitle);

void set_dialog_backtitle(const char *backtitle);

void set_dialog_subtitles(struct subtitle_list *subtitles);

scripts/kconfig/lxdialog/inputbox.c

+2 −2
Original line number Diff line number Diff line
@@ -56,9 +56,9 @@ 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 */

scripts/kconfig/lxdialog/menubox.c

+1 −1
Original line number Diff line number Diff line
@@ -193,7 +193,7 @@ int dialog_menu(const char *title, const char *prompt, 
do_resize:

	height = getmaxy(stdscr);

	width = getmaxx(stdscr);

	if (height < 15 || width < 65)

	if (height < MENUBOX_HEIGTH_MIN || width < MENUBOX_WIDTH_MIN)

		return -ERRDISPLAYTOOSMALL;



	height -= 4;

scripts/kconfig/lxdialog/textbox.c

+1 −1
Original line number Diff line number Diff line
@@ -80,7 +80,7 @@ int dialog_textbox(const char *title, char *tbuf, int initial_height, 


do_resize:

	getmaxyx(stdscr, height, width);

	if (height < 8 || width < 8)

	if (height < TEXTBOX_HEIGTH_MIN || width < TEXTBOX_WIDTH_MIN)

		return -ERRDISPLAYTOOSMALL;

	if (initial_height != 0)

		height = initial_height;