mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-28 19:20:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

(RMenu) Build fixes

Browse Source
This commit is contained in:
twinaphex 2015-02-14 00:51:17 +01:00
parent df35e9fb75
commit 7d32b27024
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
menu/drivers/rmenu.c
View File

@ -74,7 +74,7 @@ static int rmenu_entry_iterate(unsigned action)
return -1;
cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(
menu->menu_list->selection_buf, menu->selection_ptr);
menu->menu_list->selection_buf, menu->navigation.selection_ptr);
menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
@ -171,11 +171,11 @@ static void rmenu_render(void)
if (!menu->menu_list->selection_buf)
return;
begin = (menu->selection_ptr >= (ENTRIES_HEIGHT / 2)) ?
(menu->selection_ptr - (ENTRIES_HEIGHT / 2)) : 0;
end = ((menu->selection_ptr + ENTRIES_HEIGHT) <=
begin = (menu->navigation.selection_ptr >= (ENTRIES_HEIGHT / 2)) ?
(menu->navigation.selection_ptr - (ENTRIES_HEIGHT / 2)) : 0;
end = ((menu->navigation.selection_ptr + ENTRIES_HEIGHT) <=
menu_list_get_size(menu->menu_list)) ?
menu->selection_ptr + ENTRIES_HEIGHT :
menu->navigation.selection_ptr + ENTRIES_HEIGHT :
menu_list_get_size(menu->menu_list);
if (menu_list_get_size(menu->menu_list) <= ENTRIES_HEIGHT)
@ -255,7 +255,7 @@ static void rmenu_render(void)
entry_label, path,
path_buf, sizeof(path_buf));
selected = (i == menu->selection_ptr);
selected = (i == menu->navigation.selection_ptr);
menu_animation_ticker_line(entry_title_buf, RMENU_TERM_WIDTH - (w + 1 + 2),
g_extern.frame_count / 15, path, selected);

10
menu/drivers/rmenu_xui.cpp
View File

@ -68,7 +68,7 @@ static int rmenu_xui_entry_iterate(unsigned action)
return -1;
cbs = (menu_file_list_cbs_t*)menu_list_get_actiondata_at_offset(
menu->menu_list->selection_buf, menu->selection_ptr);
menu->menu_list->selection_buf, menu->navigation.selection_ptr);
menu_list_get_last_stack(menu->menu_list, NULL, &label, NULL);
@ -621,7 +621,7 @@ static void rmenu_xui_render(void)
mbstowcs(msg_right, type_str, sizeof(msg_right) / sizeof(wchar_t));
rmenu_xui_set_list_text(i, msg_left, msg_right);
}
XuiListSetCurSelVisible(m_menulist, menu->selection_ptr);
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);
if (menu->keyboard.display)
{
@ -645,7 +645,7 @@ static void rmenu_xui_populate_entries(const char *path,
(void)label;
(void)path;
XuiListSetCurSelVisible(m_menulist, menu->selection_ptr);
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);
}
static void rmenu_xui_navigation_clear(bool pending_push)
@ -653,7 +653,7 @@ static void rmenu_xui_navigation_clear(bool pending_push)
menu_handle_t *menu = menu_driver_resolve();
if (menu)
XuiListSetCurSelVisible(m_menulist, menu->selection_ptr);
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);
}
static void rmenu_xui_navigation_set_visible(void)
@ -661,7 +661,7 @@ static void rmenu_xui_navigation_set_visible(void)
menu_handle_t *menu = menu_driver_resolve();
if (menu)
XuiListSetCurSelVisible(m_menulist, menu->selection_ptr);
XuiListSetCurSelVisible(m_menulist, menu->navigation.selection_ptr);
}
static void rmenu_xui_navigation_alphabet(size_t *ptr_out)