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

* grub-core/gfxmenu.c (list_get_minimal_size): Corrected minimal

Browse source 
width calculations.
This commit is contained in:
Vladimir Testov 2013-10-08 15:35:00 +04:00
parent ea547e1413
commit 7286c38450
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2013-10-08 Vladimir Testov <vladimir.testov@rosalab.ru>
* grub-core/gfxmenu.c (list_get_minimal_size): Corrected minimal
width calculations.
2013-10-07 Vladimir Serbinenko <phcoder@gmail.com> 2013-10-07 Vladimir Serbinenko <phcoder@gmail.com>
* docs/grub.texi: Update note on colors on emu console. * docs/grub.texi: Update note on colors on emu console.

5
grub-core/gfxmenu/gui_list.c
View file

@ -430,7 +430,9 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
grub_gfxmenu_box_t selbox = self->selected_item_box; grub_gfxmenu_box_t selbox = self->selected_item_box;
int sel_top_pad = selbox->get_top_pad (selbox); int sel_top_pad = selbox->get_top_pad (selbox);
int sel_bottom_pad = selbox->get_bottom_pad (selbox); int sel_bottom_pad = selbox->get_bottom_pad (selbox);
int sel_left_pad = selbox->get_left_pad (selbox);
int sel_right_pad = selbox->get_right_pad (selbox);
*width = grub_font_get_string_width (self->item_font, "Typical OS"); *width = grub_font_get_string_width (self->item_font, "Typical OS");
width_s = grub_font_get_string_width (self->selected_item_font, width_s = grub_font_get_string_width (self->selected_item_font,
"Typical OS"); "Typical OS");
@ -438,6 +440,7 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
*width = width_s; *width = width_s;
*width += 2 * boxpad + box_left_pad + box_right_pad *width += 2 * boxpad + box_left_pad + box_right_pad
+ sel_left_pad + sel_right_pad + 2
+ self->item_icon_space + self->icon_width; + self->item_icon_space + self->icon_width;
/* Set the menu box height to fit the items. */ /* Set the menu box height to fit the items. */