Rename some static functions
This commit is contained in:
parent
ab4ca635be
commit
d50c9236f4
|
@ -30,30 +30,6 @@ menu_list_t *menu_list_get_ptr(void)
|
||||||
return menu->menu_list;
|
return menu->menu_list;
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Before a refresh, we could have deleted a
|
|
||||||
* file on disk, causing selection_ptr to
|
|
||||||
* suddendly be out of range.
|
|
||||||
*
|
|
||||||
* Ensure it doesn't overflow.
|
|
||||||
**/
|
|
||||||
static void menu_entries_refresh(file_list_t *list)
|
|
||||||
{
|
|
||||||
menu_navigation_t *nav = menu_navigation_get_ptr();
|
|
||||||
menu_list_t *menu_list = menu_list_get_ptr();
|
|
||||||
if (!nav || !menu_list)
|
|
||||||
return;
|
|
||||||
if (!list)
|
|
||||||
return;
|
|
||||||
|
|
||||||
if (nav->selection_ptr >= menu_list_get_size(menu_list)
|
|
||||||
&& menu_list_get_size(menu_list))
|
|
||||||
menu_navigation_set(nav,
|
|
||||||
menu_list_get_size(menu_list) - 1, true);
|
|
||||||
else if (!menu_list_get_size(menu_list))
|
|
||||||
menu_navigation_clear(nav, true);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* menu_entries_list_elem_is_dir:
|
* menu_entries_list_elem_is_dir:
|
||||||
* @list : File list handle.
|
* @list : File list handle.
|
||||||
|
@ -103,7 +79,7 @@ static INLINE int menu_entries_list_get_first_char(
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
static void menu_entries_build_scroll_indices(file_list_t *list)
|
static void menu_list_build_scroll_indices(file_list_t *list)
|
||||||
{
|
{
|
||||||
size_t i;
|
size_t i;
|
||||||
int current;
|
int current;
|
||||||
|
@ -139,6 +115,32 @@ static void menu_entries_build_scroll_indices(file_list_t *list)
|
||||||
list->size - 1;
|
list->size - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Before a refresh, we could have deleted a
|
||||||
|
* file on disk, causing selection_ptr to
|
||||||
|
* suddendly be out of range.
|
||||||
|
*
|
||||||
|
* Ensure it doesn't overflow.
|
||||||
|
**/
|
||||||
|
static void menu_list_refresh(file_list_t *list)
|
||||||
|
{
|
||||||
|
menu_navigation_t *nav = menu_navigation_get_ptr();
|
||||||
|
menu_list_t *menu_list = menu_list_get_ptr();
|
||||||
|
if (!nav || !menu_list)
|
||||||
|
return;
|
||||||
|
if (!list)
|
||||||
|
return;
|
||||||
|
|
||||||
|
menu_list_build_scroll_indices(list);
|
||||||
|
|
||||||
|
if (nav->selection_ptr >= menu_list_get_size(menu_list)
|
||||||
|
&& menu_list_get_size(menu_list))
|
||||||
|
menu_navigation_set(nav,
|
||||||
|
menu_list_get_size(menu_list) - 1, true);
|
||||||
|
else if (!menu_list_get_size(menu_list))
|
||||||
|
menu_navigation_clear(nav, true);
|
||||||
|
}
|
||||||
|
|
||||||
static void menu_list_destroy(file_list_t *list)
|
static void menu_list_destroy(file_list_t *list)
|
||||||
{
|
{
|
||||||
unsigned i;
|
unsigned i;
|
||||||
|
@ -419,8 +421,7 @@ int menu_list_populate_generic(file_list_t *list, const char *path,
|
||||||
|
|
||||||
nav->scroll.indices.size = 0;
|
nav->scroll.indices.size = 0;
|
||||||
|
|
||||||
menu_entries_build_scroll_indices(list);
|
menu_list_refresh(list);
|
||||||
menu_entries_refresh(list);
|
|
||||||
|
|
||||||
menu_driver_populate_entries(path, label, type);
|
menu_driver_populate_entries(path, label, type);
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue