This commit is contained in:
twinaphex 2017-05-13 23:47:25 +02:00
parent 6dd3a84bc9
commit 0185f71bab
8 changed files with 9 additions and 13 deletions

View File

@ -130,7 +130,7 @@ static int action_left_scroll(unsigned type, const char *label,
size_t idx = selection - fast_scroll_speed;
bool scroll = true;
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
else
{

View File

@ -141,7 +141,7 @@ static int action_right_scroll(unsigned type, const char *label,
bool scroll = true;
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
else
{

View File

@ -860,7 +860,7 @@ static int rgui_pointer_tap(void *data,
return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
menu_navigation_set_selection(ptr);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
return 0;

View File

@ -4089,7 +4089,7 @@ static int xmb_pointer_tap(void *userdata,
return (unsigned)menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
menu_navigation_set_selection(ptr);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
return 0;

View File

@ -189,7 +189,7 @@ static bool menu_entries_refresh(void *data)
size_t idx = list_size - 1;
bool scroll = true;
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
else if (!list_size)
{

View File

@ -60,7 +60,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
{
bool scroll = true;
menu_navigation_set_selection(0);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_CLEAR, data);
}
break;
@ -84,7 +84,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
bool scroll = true;
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, NULL);
}
else
@ -132,16 +132,13 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
}
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
menu_navigation_ctl(MENU_NAVIGATION_CTL_DECREMENT, NULL);
menu_driver_decrement_navigation();
}
break;
case MENU_NAVIGATION_CTL_SET:
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, data);
break;
case MENU_NAVIGATION_CTL_SET_LAST:
{
size_t menu_list_size = menu_entries_get_size();

View File

@ -31,7 +31,6 @@ enum menu_navigation_ctl_state
MENU_NAVIGATION_CTL_DEINIT,
MENU_NAVIGATION_CTL_INCREMENT,
MENU_NAVIGATION_CTL_DECREMENT,
MENU_NAVIGATION_CTL_SET,
MENU_NAVIGATION_CTL_SET_LAST,
MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
MENU_NAVIGATION_CTL_ASCEND_ALPHABET,

View File

@ -41,7 +41,7 @@ static void menu_input_search_cb(void *userdata, const char *str)
{
bool scroll = true;
menu_navigation_set_selection(idx);
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
}
menu_input_dialog_end();