From: Samuel Mendoza-Jonas Date: Wed, 10 Sep 2014 00:50:44 +0000 (+1000) Subject: ui/ncurses: Correctly size pad for config screen X-Git-Tag: v1.0.0~113 X-Git-Url: http://git.ozlabs.org/?p=petitboot;a=commitdiff_plain;h=742b01687510dd78b3f5e6d3b98b5f420eb70443;ds=sidebyside ui/ncurses: Correctly size pad for config screen Signed-off-by: Samuel Mendoza-Jonas Signed-off-by: Jeremy Kerr --- diff --git a/ui/ncurses/nc-config.c b/ui/ncurses/nc-config.c index 7a709ab..4b1a58f 100644 --- a/ui/ncurses/nc-config.c +++ b/ui/ncurses/nc-config.c @@ -781,13 +781,18 @@ static void config_screen_draw(struct config_screen *screen, /* The size of the pad we'll need depends on the number of interfaces. * * We use N_FIELDS (which is quite conservative, as some fields share - * a line) as a base, then add 3 (as the network select field is - * takes 3 lines), and n_interfaces (as the network interface field - * has n_interfaces lines). + * a line) as a base, then: + * - add 6 (as the network select & boot device select fields take 3 + * lines each), + * - add n_interfaces for every field in the network select field, and + * - add (n_blockdevs + n_interfaces) for every field in the boot device + * select field */ - height = N_FIELDS + 3; - if (sysinfo) + height = N_FIELDS + 6; + if (sysinfo) { height += sysinfo->n_interfaces; + height += (sysinfo->n_blockdevs + sysinfo->n_interfaces); + } if (!screen->pad || getmaxy(screen->pad) < height) { if (screen->pad) delwin(screen->pad);