mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-01-30 12:32:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor scroll indices code for menu_navigation_ctl

Browse Source
This commit is contained in:
twinaphex 2015-09-25 18:12:00 +02:00
parent f13dc6c014
commit cbefb0394f
3 changed files with 19 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
menu/menu_displaylist.c
View File

@ -167,13 +167,13 @@ static void menu_list_build_scroll_indices(file_list_t *list)
size_t i;
int current;
bool current_is_dir;
size_t scroll_indices = 0;
menu_navigation_t *nav = menu_navigation_get_ptr();
size_t scroll_value = 0;
if (!nav || !list || !list->size)
if (!list || !list->size)
return;
nav->scroll.indices.list[scroll_indices++] = 0;
menu_navigation_ctl(MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES, NULL);
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
current = menu_list_elem_get_first_char(list, 0);
current_is_dir = menu_list_elem_is_dir(list, 0);
@ -184,14 +184,15 @@ static void menu_list_build_scroll_indices(file_list_t *list)
bool is_dir = menu_list_elem_is_dir(list, i);
if ((current_is_dir && !is_dir) || (first > current))
nav->scroll.indices.list[scroll_indices++] = i;
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &i);
current = first;
current_is_dir = is_dir;
}
nav->scroll.indices.list[scroll_indices++] = list->size - 1;
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_INDICES, &scroll_indices);
scroll_value = list->size - 1;
menu_navigation_ctl(MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX, &scroll_value);
}
/**
@ -204,15 +205,12 @@ static void menu_list_build_scroll_indices(file_list_t *list)
static void menu_list_refresh(file_list_t *list)
{
size_t list_size, selection;
size_t scroll_indices = 0;
menu_list_t *menu_list = menu_list_get_ptr();
if (!menu_list || !list)
return;
if (!menu_navigation_ctl(MENU_NAVIGATION_CTL_GET_SELECTION, &selection))
return;
menu_navigation_ctl(MENU_NAVIGATION_CTL_SET_SCROLL_INDICES, &scroll_indices);
menu_list_build_scroll_indices(list);
list_size = menu_list_get_size(menu_list);

11
menu/menu_navigation.c
View File

@ -182,12 +182,19 @@ bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data)
nav->selection_ptr = *sel;
}
return true;
case MENU_NAVIGATION_CTL_SET_SCROLL_INDICES:
case MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES:
{
if (!nav)
return false;
nav->scroll.indices.size = 0;
}
return true;
case MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX:
{
size_t *sel = (size_t*)data;
if (!nav || !sel)
return false;
nav->scroll.indices.size = *sel;
nav->scroll.indices.list[nav->scroll.indices.size++] = *sel;
}
return true;
}

3
menu/menu_navigation.h
View File

@ -55,7 +55,8 @@ enum menu_navigation_ctl_state
MENU_NAVIGATION_CTL_ASCEND_ALPHABET,
MENU_NAVIGATION_CTL_SET_SELECTION,
MENU_NAVIGATION_CTL_GET_SELECTION,
MENU_NAVIGATION_CTL_SET_SCROLL_INDICES
MENU_NAVIGATION_CTL_CLEAR_SCROLL_INDICES,
MENU_NAVIGATION_CTL_ADD_SCROLL_INDEX
};
bool menu_navigation_ctl(enum menu_navigation_ctl_state state, void *data);