libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-24 08:30:16 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

Cleanups

Browse Source
This commit is contained in:
twinaphex 2017-05-17 07:55:02 +02:00
parent fe4622fd3b
commit ffac0c119e
1 changed files with 6 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_driver.c
View File

@ -948,20 +948,17 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
case MENU_NAVIGATION_CTL_INCREMENT: case MENU_NAVIGATION_CTL_INCREMENT:
{ {
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned *scroll_speed = (unsigned*)data; unsigned scroll_speed = *((unsigned*)data);
size_t menu_list_size = menu_entries_get_size(); size_t menu_list_size = menu_entries_get_size();
bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable; bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
if (!scroll_speed)
return false;
if (menu_driver_selection_ptr >= menu_list_size - 1 if (menu_driver_selection_ptr >= menu_list_size - 1
&& !wraparound_enable) && !wraparound_enable)
return false; return false;
if ((menu_driver_selection_ptr + (*scroll_speed)) < menu_list_size) if ((menu_driver_selection_ptr + scroll_speed) < menu_list_size)
{ {
size_t idx = menu_driver_selection_ptr + (*scroll_speed); size_t idx = menu_driver_selection_ptr + scroll_speed;
menu_navigation_set_selection(idx); menu_navigation_set_selection(idx);
menu_driver_navigation_set(true); menu_driver_navigation_set(true);
@ -985,18 +982,15 @@ bool menu_driver_ctl(enum rarch_menu_ctl_state state, void *data)
{ {
size_t idx = 0; size_t idx = 0;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
unsigned *scroll_speed = (unsigned*)data; unsigned scroll_speed = *((unsigned*)data);
size_t menu_list_size = menu_entries_get_size(); size_t menu_list_size = menu_entries_get_size();
bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable; bool wraparound_enable = settings->bools.menu_navigation_wraparound_enable;
if (!scroll_speed)
return false;
if (menu_driver_selection_ptr == 0 && !wraparound_enable) if (menu_driver_selection_ptr == 0 && !wraparound_enable)
return false; return false;
if (menu_driver_selection_ptr >= *scroll_speed) if (menu_driver_selection_ptr >= scroll_speed)
idx = menu_driver_selection_ptr - *scroll_speed; idx = menu_driver_selection_ptr - scroll_speed;
else else
{ {
idx = menu_list_size - 1; idx = menu_list_size - 1;