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

* grub-core/gfxmenu/gui_circular_progress.c: Take both width and height

Browse source 
into account when calculating radius.
This commit is contained in:
Vladimir Testov 2013-04-03 09:20:29 +02:00 committed by Vladimir 'phcoder' Serbinenko
parent 9efd73ec66
commit c3578acfbb
3 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2013-04-03 Vladimir Testov <vladimir.testov@rosalab.ru>
2013-04-03 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/gfxmenu/gui_circular_progress.c: Take both width and height
into account when calculating radius.
2013-04-03 Vladimir Testov <vladimir.testov@rosalab.ru> 2013-04-03 Vladimir Testov <vladimir.testov@rosalab.ru>
* grub-core/gfxmenu/view.c: Fix off-by-one error. * grub-core/gfxmenu/view.c: Fix off-by-one error.

2
grub-core/gfxmenu/gui_circular_progress.c
View file

@ -138,7 +138,7 @@ circprog_paint (void *vself, const grub_video_rect_t *region)
(height - center_height) / 2, 0, 0, (height - center_height) / 2, 0, 0,
center_width, center_height); center_width, center_height);
int radius = width / 2 - tick_width / 2 - 1; int radius = grub_min (height, width) / 2 - grub_max (tick_height, tick_width) / 2 - 1;
int nticks; int nticks;
int tick_begin; int tick_begin;
int tick_end; int tick_end;

3
include/grub/misc.h
View file

@ -478,4 +478,7 @@ void EXPORT_FUNC(grub_real_boot_time) (const char *file,
#define grub_boot_time(fmt, args...) #define grub_boot_time(fmt, args...)
#endif #endif
#define grub_max(a, b) (((a) > (b)) ? (a) : (b))
#define grub_min(a, b) (((a) < (b)) ? (a) : (b))
#endif /* ! GRUB_MISC_HEADER */ #endif /* ! GRUB_MISC_HEADER */