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

* grub-core/gfxmenu/widget-box.c: Fixed draw function. Now it takes

Browse source 
maximum of NW, N, NE heights instead of N's height and maximum of
       NW, W, SW widths instead of W's width. (So the box will be always
       correctly drawn)
This commit is contained in:
Vladimir Testov 2013-07-25 18:15:15 +04:00
parent 4f0ad02936
commit ba8bc620d1
2 changed files with 25 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
2013-07-25 Vladimir Testov <vladimir.testov@rosalab.ru>
* grub-core/gfxmenu/widget-box.c: Fixed draw function. Now it takes
maximum of NW, N, NE heights instead of N's height and maximum of
NW, W, SW widths instead of W's width. (So the box will be always
correctly drawn)
2013-07-20 Grégoire Sutre <gregoire.sutre@gmail.com> 2013-07-20 Grégoire Sutre <gregoire.sutre@gmail.com>
* grub-core/partmap/bsdlabel.c (netopenbsdlabel_partition_map_iterate): * grub-core/partmap/bsdlabel.c (netopenbsdlabel_partition_map_iterate):

20
grub-core/gfxmenu/widget-box.c
View file

@ -80,9 +80,25 @@ draw (grub_gfxmenu_box_t self, int x, int y)
{ {
int height_n; int height_n;
int width_w; int width_w;
int tmp;
height_n = get_height (self->scaled_pixmaps[BOX_PIXMAP_N]); /* Count maximum height of NW, N, NE. */
width_w = get_width (self->scaled_pixmaps[BOX_PIXMAP_W]); height_n = get_height (self->scaled_pixmaps[BOX_PIXMAP_NW]);
tmp = get_height (self->scaled_pixmaps[BOX_PIXMAP_N]);
if (tmp > height_n)
height_n = tmp;
tmp = get_height (self->scaled_pixmaps[BOX_PIXMAP_NE]);
if (tmp > height_n)
height_n = tmp;
/* Count maximum width of NW, W, SW. */
width_w = get_width (self->scaled_pixmaps[BOX_PIXMAP_NW]);
tmp = get_width (self->scaled_pixmaps[BOX_PIXMAP_W]);
if (tmp > width_w)
width_w = tmp;
tmp = get_width (self->scaled_pixmaps[BOX_PIXMAP_SW]);
if (tmp > width_w)
width_w = tmp;
/* Draw sides. */ /* Draw sides. */
blit (self, BOX_PIXMAP_N, x + width_w, y); blit (self, BOX_PIXMAP_N, x + width_w, y);