mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-07 03:40:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

(XMB) Move first visible item detection to xmb_selection_pointer_changed()

Browse Source
This commit is contained in:
Higor Eurípedes 2015-06-23 13:27:45 -03:00
parent 5f0d41765d
commit 57fe277310
1 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
menu/drivers/xmb.c
View File

@ -583,7 +583,7 @@ static void xmb_update_boxart(xmb_handle_t *xmb, unsigned i)
static void xmb_selection_pointer_changed(void) static void xmb_selection_pointer_changed(void)
{ {
unsigned i, current, end, tag, height; unsigned i, current, end, tag, height, skip;
int threshold = 0; int threshold = 0;
xmb_handle_t *xmb = NULL; xmb_handle_t *xmb = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
@ -608,6 +608,8 @@ static void xmb_selection_pointer_changed(void)
video_driver_get_size(NULL, &height); video_driver_get_size(NULL, &height);
menu_animation_kill_by_tag(disp->animation, tag); menu_animation_kill_by_tag(disp->animation, tag);
menu_entries_set_start(0);
skip = 0;
for (i = 0; i < end; i++) for (i = 0; i < end; i++)
{ {
@ -632,6 +634,9 @@ static void xmb_selection_pointer_changed(void)
xmb_update_boxart(xmb, i); xmb_update_boxart(xmb, i);
} }
if (real_iy < -threshold)
skip++;
if (real_iy < -threshold || real_iy > height+threshold) if (real_iy < -threshold || real_iy > height+threshold)
{ {
node->alpha = node->label_alpha = ia; node->alpha = node->label_alpha = ia;
@ -650,6 +655,8 @@ static void xmb_selection_pointer_changed(void)
XMB_DELAY, iy, &node->y, EASING_IN_OUT_QUAD, tag, NULL); XMB_DELAY, iy, &node->y, EASING_IN_OUT_QUAD, tag, NULL);
} }
} }
menu_entries_set_start(skip);
} }
static void xmb_list_open_old(xmb_handle_t *xmb, static void xmb_list_open_old(xmb_handle_t *xmb,
@ -1365,37 +1372,29 @@ static void xmb_render(void)
current = nav->selection_ptr; current = nav->selection_ptr;
end = menu_list_get_size(menu_list); end = menu_list_get_size(menu_list);
menu_entries_set_start(0); if (settings->menu.pointer.enable || settings->menu.mouse.enable)
for (i = 0; i < end; i++)
{ {
float item_y1 = xmb->margins.screen.top + xmb_item_y(xmb, i, current); for (i = 0; i < end; i++)
float item_y2 = item_y1 + xmb->icon.size;
if (item_y2 < 0)
{ {
menu_entries_set_start(menu_entries_get_start() + 1); float item_y1 = xmb->margins.screen.top + xmb_item_y(xmb, i, current);
continue; float item_y2 = item_y1 + xmb->icon.size;
}
if (item_y1 > height) if (settings->menu.pointer.enable)
continue; {
if (menu_input->pointer.y > item_y1 && menu_input->pointer.y < item_y2)
menu_input->pointer.ptr = i;
}
if (settings->menu.pointer.enable) if (settings->menu.mouse.enable)
{ {
if (menu_input->pointer.y > item_y1 && menu_input->pointer.y < item_y2) if (menu_input->mouse.y > item_y1 && menu_input->mouse.y < item_y2)
menu_input->pointer.ptr = i; menu_input->mouse.ptr = i;
} }
if (settings->menu.mouse.enable)
{
if (menu_input->mouse.y > item_y1 && menu_input->mouse.y < item_y2)
menu_input->mouse.ptr = i;
} }
} }
if (menu_entries_get_start() >= 5) if (menu_entries_get_start() >= end)
menu_entries_set_start(menu_entries_get_start() - 5); menu_entries_set_start(0);
anim->is_active = false; anim->is_active = false;
anim->label.is_updated = false; anim->label.is_updated = false;