vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

menu: fix line count calculation for long lines

Browse source 
It gave one extra screen line if length was exactly equal to screen
width.

Reported by Michael Chang.
Also-By: Michael Chang <mchang@suse.com>
This commit is contained in:
Andrei Borzenkov 2015-12-30 06:20:51 +03:00
parent dbab354157
commit 93ecc3f1f8
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
grub-core/normal/menu_entry.c
View file

@ -126,9 +126,13 @@ ensure_space (struct line *linep, int extra)
static int static int
get_logical_num_lines (struct line *linep, struct per_term_screen *term_screen) get_logical_num_lines (struct line *linep, struct per_term_screen *term_screen)
{ {
return (grub_getstringwidth (linep->buf, linep->buf + linep->len, grub_size_t width = grub_getstringwidth (linep->buf, linep->buf + linep->len,
term_screen->term) term_screen->term);
/ (unsigned) term_screen->geo.entry_width) + 1;
/* Empty line still consumes space on screen */
return width ? (width + (unsigned) term_screen->geo.entry_width - 1) /
(unsigned) term_screen->geo.entry_width
: 1;
} }
static void static void