mirror of
https://github.com/libretro/RetroArch
synced 2025-04-11 00:44:20 +00:00
Cleanups
This commit is contained in:
parent
6dd3a84bc9
commit
0185f71bab
@ -130,7 +130,7 @@ static int action_left_scroll(unsigned type, const char *label,
|
|||||||
size_t idx = selection - fast_scroll_speed;
|
size_t idx = selection - fast_scroll_speed;
|
||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
menu_navigation_set_selection(idx);
|
menu_navigation_set_selection(idx);
|
||||||
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
|
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -141,7 +141,7 @@ static int action_right_scroll(unsigned type, const char *label,
|
|||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
|
|
||||||
menu_navigation_set_selection(idx);
|
menu_navigation_set_selection(idx);
|
||||||
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
|
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
|
@ -860,7 +860,7 @@ static int rgui_pointer_tap(void *data,
|
|||||||
return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
|
return menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
|
||||||
|
|
||||||
menu_navigation_set_selection(ptr);
|
menu_navigation_set_selection(ptr);
|
||||||
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
|
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -4089,7 +4089,7 @@ static int xmb_pointer_tap(void *userdata,
|
|||||||
return (unsigned)menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
|
return (unsigned)menu_entry_action(entry, (unsigned)selection, MENU_ACTION_SELECT);
|
||||||
|
|
||||||
menu_navigation_set_selection(ptr);
|
menu_navigation_set_selection(ptr);
|
||||||
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET, &scroll);
|
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, &scroll);
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
|
@ -189,7 +189,7 @@ static bool menu_entries_refresh(void *data)
|
|||||||
size_t idx = list_size - 1;
|
size_t idx = list_size - 1;
|
||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
menu_navigation_set_selection(idx);
|
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)
|
else if (!list_size)
|
||||||
{
|
{
|
||||||
|
@ -60,7 +60,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
|
|||||||
{
|
{
|
||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
menu_navigation_set_selection(0);
|
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);
|
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_CLEAR, data);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
@ -84,7 +84,7 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
|
|||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
|
|
||||||
menu_navigation_set_selection(idx);
|
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);
|
menu_navigation_ctl(MENU_NAVIGATION_CTL_INCREMENT, NULL);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -132,16 +132,13 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
|
|||||||
}
|
}
|
||||||
|
|
||||||
menu_navigation_set_selection(idx);
|
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_navigation_ctl(MENU_NAVIGATION_CTL_DECREMENT, NULL);
|
||||||
|
|
||||||
menu_driver_decrement_navigation();
|
menu_driver_decrement_navigation();
|
||||||
|
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case MENU_NAVIGATION_CTL_SET:
|
|
||||||
menu_driver_ctl(RARCH_MENU_CTL_NAVIGATION_SET, data);
|
|
||||||
break;
|
|
||||||
case MENU_NAVIGATION_CTL_SET_LAST:
|
case MENU_NAVIGATION_CTL_SET_LAST:
|
||||||
{
|
{
|
||||||
size_t menu_list_size = menu_entries_get_size();
|
size_t menu_list_size = menu_entries_get_size();
|
||||||
|
@ -31,7 +31,6 @@ enum menu_navigation_ctl_state
|
|||||||
MENU_NAVIGATION_CTL_DEINIT,
|
MENU_NAVIGATION_CTL_DEINIT,
|
||||||
MENU_NAVIGATION_CTL_INCREMENT,
|
MENU_NAVIGATION_CTL_INCREMENT,
|
||||||
MENU_NAVIGATION_CTL_DECREMENT,
|
MENU_NAVIGATION_CTL_DECREMENT,
|
||||||
MENU_NAVIGATION_CTL_SET,
|
|
||||||
MENU_NAVIGATION_CTL_SET_LAST,
|
MENU_NAVIGATION_CTL_SET_LAST,
|
||||||
MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
|
MENU_NAVIGATION_CTL_DESCEND_ALPHABET,
|
||||||
MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
|
MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
|
||||||
|
@ -41,7 +41,7 @@ static void menu_input_search_cb(void *userdata, const char *str)
|
|||||||
{
|
{
|
||||||
bool scroll = true;
|
bool scroll = true;
|
||||||
menu_navigation_set_selection(idx);
|
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();
|
menu_input_dialog_end();
|
||||||
|
Loading…
x
Reference in New Issue
Block a user