mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-09 21:45:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1860 from heuripedes/master

Browse Source 
(XMB) Ensure proper ordering of items during toggles
This commit is contained in:
Twinaphex 2015-06-26 05:15:23 +02:00
commit fc0d1080a2
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
menu/drivers/xmb.c
View File

@ -583,7 +583,7 @@ static void xmb_update_boxart(xmb_handle_t *xmb, unsigned i)
xmb->boxart = 0; xmb->boxart = 0;
} }
static void xmb_selection_pointer_changed(void) static void xmb_selection_pointer_changed(bool allow_animations)
{ {
unsigned i, current, end, tag, height, skip; unsigned i, current, end, tag, height, skip;
int threshold = 0; int threshold = 0;
@ -639,7 +639,7 @@ static void xmb_selection_pointer_changed(void)
if (real_iy < -threshold) if (real_iy < -threshold)
skip++; skip++;
if (real_iy < -threshold || real_iy > height+threshold) if (!allow_animations || (real_iy < -threshold || real_iy > height+threshold))
{ {
node->alpha = node->label_alpha = ia; node->alpha = node->label_alpha = ia;
node->y = iy; node->y = iy;
@ -1058,6 +1058,7 @@ static void xmb_populate_entries(const char *path,
if (xmb->prevent_populate) if (xmb->prevent_populate)
{ {
xmb_selection_pointer_changed(false);
xmb->prevent_populate = false; xmb->prevent_populate = false;
return; return;
} }
@ -2119,22 +2120,22 @@ static void xmb_context_reset(void)
static void xmb_navigation_clear(bool pending_push) static void xmb_navigation_clear(bool pending_push)
{ {
if (!pending_push) if (!pending_push)
xmb_selection_pointer_changed(); xmb_selection_pointer_changed(true);
} }
static void xmb_navigation_pointer_changed(void) static void xmb_navigation_pointer_changed(void)
{ {
xmb_selection_pointer_changed(); xmb_selection_pointer_changed(true);
} }
static void xmb_navigation_set(bool scroll) static void xmb_navigation_set(bool scroll)
{ {
xmb_selection_pointer_changed(); xmb_selection_pointer_changed(true);
} }
static void xmb_navigation_alphabet(size_t *unused) static void xmb_navigation_alphabet(size_t *unused)
{ {
xmb_selection_pointer_changed(); xmb_selection_pointer_changed(true);
} }
static void xmb_list_insert(file_list_t *list, static void xmb_list_insert(file_list_t *list,