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

* grub-core/gfxmenu/gui_list.c: Fix height calculation.

Browse source
This commit is contained in:
Vladimir Testov 2013-07-14 23:02:37 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 286fe4b379
commit a8674ad37b
2 changed files with 14 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ChangeLog
View file

@ -1,3 +1,7 @@
2013-07-14 Vladimir Testov <vladimir.testov@rosalab.ru>
* grub-core/gfxmenu/gui_list.c: Fix height calculation.
2013-07-14 Vladimir Serbinenko <phcoder@gmail.com> 2013-07-14 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/fs/zfs/zfs.c: Stylistic fixes. * grub-core/fs/zfs/zfs.c: Stylistic fixes.

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

@ -102,8 +102,12 @@ get_num_shown_items (list_impl_t self)
grub_gfxmenu_box_t box = self->menu_box; grub_gfxmenu_box_t box = self->menu_box;
int box_top_pad = box->get_top_pad (box); int box_top_pad = box->get_top_pad (box);
int box_bottom_pad = box->get_bottom_pad (box); int box_bottom_pad = box->get_bottom_pad (box);
grub_gfxmenu_box_t selbox = self->selected_item_box;
int sel_top_pad = selbox->get_top_pad (selbox);
int sel_bottom_pad = selbox->get_bottom_pad (selbox);
return (self->bounds.height + item_vspace - 2 * boxpad return (self->bounds.height + item_vspace - 2 * boxpad
- sel_top_pad - sel_bottom_pad
- box_top_pad - box_bottom_pad) / (item_height + item_vspace); - box_top_pad - box_bottom_pad) / (item_height + item_vspace);
} }
@ -257,7 +261,7 @@ draw_menu (list_impl_t self, int num_shown_items)
int cwidth = oviewport.width - 2 * boxpad - 2; int cwidth = oviewport.width - 2 * boxpad - 2;
if (selbox->get_border_width) if (selbox->get_border_width)
cwidth -= selbox->get_border_width (selbox); cwidth -= selbox->get_border_width (selbox);
selbox->set_content_size (selbox, cwidth, item_height - 1); selbox->set_content_size (selbox, cwidth, item_height);
selbox->draw (selbox, 0, selbox->draw (selbox, 0,
item_top - sel_toppad); item_top - sel_toppad);
} }
@ -397,7 +401,8 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
unsigned width_s; unsigned width_s;
grub_gfxmenu_box_t selbox = self->selected_item_box; grub_gfxmenu_box_t selbox = self->selected_item_box;
int sel_toppad = selbox->get_top_pad (selbox); int sel_top_pad = selbox->get_top_pad (selbox);
int sel_bottom_pad = selbox->get_bottom_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,
@ -411,7 +416,8 @@ list_get_minimal_size (void *vself, unsigned *width, unsigned *height)
*height = (item_height * num_items *height = (item_height * num_items
+ item_vspace * (num_items - 1) + item_vspace * (num_items - 1)
+ 2 * boxpad + 2 * boxpad
+ box_top_pad + box_bottom_pad + sel_toppad); + box_top_pad + box_bottom_pad
+ sel_top_pad + sel_bottom_pad);
} }
else else
{ {