CTCaer/RetroArch
1
0
Fork 0
mirror of https://github.com/CTCaer/RetroArch.git synced 2024-12-16 15:27:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Some cleanups - use menu_navigation_get_ptr

Browse Source
This commit is contained in:
twinaphex 2015-06-12 16:13:12 +02:00
parent 64d6a6db81
commit 1011e0499e
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
menu/drivers/glui.c
View File

@ -368,7 +368,6 @@ static void glui_frame(void)
menu_display_font_bind_block(menu, font_driver, &glui->list_block); menu_display_font_bind_block(menu, font_driver, &glui->list_block);
glui_render_menu_list(glui, menu, normal_color, hover_color); glui_render_menu_list(glui, menu, normal_color, hover_color);
menu_display_font_flush_block(menu, font_driver); menu_display_font_flush_block(menu, font_driver);
@ -593,8 +592,9 @@ static float glui_get_scroll(void)
{ {
int half; int half;
unsigned width, height; unsigned width, height;
glui_handle_t *glui = NULL; glui_handle_t *glui = NULL;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
if (!menu || !menu->userdata) if (!menu || !menu->userdata)
return 0; return 0;
@ -604,9 +604,9 @@ static float glui_get_scroll(void)
glui = (glui_handle_t*)menu->userdata; glui = (glui_handle_t*)menu->userdata;
half = (height / glui->line_height) / 2; half = (height / glui->line_height) / 2;
if (menu->navigation.selection_ptr < half) if (nav->selection_ptr < half)
return 0; return 0;
return ((menu->navigation.selection_ptr + 2 - half) * glui->line_height); return ((nav->selection_ptr + 2 - half) * glui->line_height);
} }
static void glui_navigation_set(bool scroll) static void glui_navigation_set(bool scroll)

2
menu/drivers/rgui.c
View File

@ -587,7 +587,7 @@ static void rgui_navigation_clear(bool pending_push)
static void rgui_navigation_set(bool scroll) static void rgui_navigation_set(bool scroll)
{ {
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr(); menu_navigation_t *nav = menu_navigation_get_ptr();
if (!menu) if (!menu)
return; return;