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

* grub-core/gfxmenu/gui_list.c: Draw the scrollbar in a separate

Browse source 
viewport.
This commit is contained in:
Vladimir Testov 2013-10-08 16:27:56 +04:00
parent ffdfc1f3e9
commit dd2ed8b092
2 changed files with 33 additions and 20 deletions
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/gui_list.c: Draw the scrollbar in a separate
viewport.
2013-10-08 Vladimir Testov <vladimir.testov@rosalab.ru> 2013-10-08 Vladimir Testov <vladimir.testov@rosalab.ru>
* grub-core/gfxmenu/gui_list.c (list_get_minimal_size): Corrected * grub-core/gfxmenu/gui_list.c (list_get_minimal_size): Corrected

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

@ -193,7 +193,7 @@ make_selected_item_visible (list_impl_t self)
static void static void
draw_scrollbar (list_impl_t self, draw_scrollbar (list_impl_t self,
int value, int extent, int min, int max, int value, int extent, int min, int max,
int rightx, int topy, int height) int scrollbar_width, int scrollbar_height)
{ {
grub_gfxmenu_box_t frame = self->scrollbar_frame; grub_gfxmenu_box_t frame = self->scrollbar_frame;
grub_gfxmenu_box_t thumb = self->scrollbar_thumb; grub_gfxmenu_box_t thumb = self->scrollbar_thumb;
@ -201,21 +201,23 @@ draw_scrollbar (list_impl_t self,
+ frame->get_bottom_pad (frame)); + frame->get_bottom_pad (frame));
int frame_horizontal_pad = (frame->get_left_pad (frame) int frame_horizontal_pad = (frame->get_left_pad (frame)
+ frame->get_right_pad (frame)); + frame->get_right_pad (frame));
int tracktop = topy + frame->get_top_pad (frame); int thumb_vertical_pad = (thumb->get_top_pad (thumb)
int tracklen = height - frame_vertical_pad; + thumb->get_bottom_pad (thumb));
frame->set_content_size (frame, self->scrollbar_width, tracklen); int thumb_horizontal_pad = (thumb->get_left_pad (thumb)
+ thumb->get_right_pad (thumb));
int tracktop = frame->get_top_pad (frame);
int tracklen = scrollbar_height - frame_vertical_pad;
frame->set_content_size (frame,
scrollbar_width - frame_horizontal_pad,
tracklen);
int thumby = tracktop + tracklen * (value - min) / (max - min); int thumby = tracktop + tracklen * (value - min) / (max - min);
int thumbheight = tracklen * extent / (max - min) + 1; int thumbheight = tracklen * extent / (max - min) + 1;
thumb->set_content_size (thumb, thumb->set_content_size (thumb,
self->scrollbar_width - frame_horizontal_pad, scrollbar_width - frame_horizontal_pad
thumbheight - (thumb->get_top_pad (thumb) - thumb_horizontal_pad,
+ thumb->get_bottom_pad (thumb))); thumbheight - thumb_vertical_pad);
frame->draw (frame, frame->draw (frame, 0, 0);
rightx - (self->scrollbar_width + frame_horizontal_pad), thumb->draw (thumb, frame->get_left_pad (frame), thumby);
topy);
thumb->draw (thumb,
rightx - (self->scrollbar_width - frame->get_right_pad (frame)),
thumby);
} }
/* Draw the list of items. */ /* Draw the list of items. */
@ -368,13 +370,19 @@ list_paint (void *vself, const grub_video_rect_t *region)
grub_gui_restore_viewport (&vpsave2); grub_gui_restore_viewport (&vpsave2);
if (drawing_scrollbar) if (drawing_scrollbar)
{
/* Draw the scrollbar in the east slice. */
content_rect.x = self->bounds.width - box_right_pad;
content_rect.width = box_right_pad;
grub_gui_set_viewport (&content_rect, &vpsave2);
draw_scrollbar (self, draw_scrollbar (self,
self->first_shown_index, num_shown_items, self->first_shown_index, num_shown_items,
0, self->view->menu->size, 0, self->view->menu->size,
self->bounds.width - box_right_pad self->scrollbar_width,
+ self->scrollbar_width, content_rect.height);
box_top_pad, grub_gui_restore_viewport (&vpsave2);
self->bounds.height - box_top_pad - box_bottom_pad); }
} }
grub_gui_restore_viewport (&vpsave); grub_gui_restore_viewport (&vpsave);