ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(Menu) Cleanups

This commit is contained in:
twinaphex 2015-06-08 14:50:46 +02:00
parent 2fc0d7c4b4
commit 6dd133b002
13 changed files with 10 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/cbs/menu_entries_cbs_cancel.c
View File

@ -15,9 +15,7 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
#include "../menu_entry.h" #include "../menu_entry.h"
#include "../menu_setting.h"
static int action_cancel_pop_default(const char *path, static int action_cancel_pop_default(const char *path,
const char *label, unsigned type, size_t idx) const char *label, unsigned type, size_t idx)

2
menu/cbs/menu_entries_cbs_deferred_push.c
View File

@ -17,8 +17,6 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_displaylist.h" #include "../menu_displaylist.h"
#include "../menu_entries.h"
#include "../menu_setting.h"
#include "../../file_ext.h" #include "../../file_ext.h"

7
menu/cbs/menu_entries_cbs_down.c
View File

@ -21,15 +21,16 @@ static int action_bind_down_generic(unsigned type, const char *label)
{ {
unsigned scroll_speed = 0; unsigned scroll_speed = 0;
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
if (!menu) menu_navigation_t *nav = menu_navigation_get_ptr();
if (!menu || !nav)
return -1; return -1;
scroll_speed = (max(menu->navigation.scroll.acceleration, 2) - 2) / 4 + 1; scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
if (menu_list_get_size(menu->menu_list) <= 0) if (menu_list_get_size(menu->menu_list) <= 0)
return 0; return 0;
menu_navigation_increment(&menu->navigation, scroll_speed); menu_navigation_increment(nav, scroll_speed);
return 0; return 0;
} }

1
menu/cbs/menu_entries_cbs_get_value.c
View File

@ -19,7 +19,6 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h" #include "../menu_entries.h"
#include "../menu_shader.h" #include "../menu_shader.h"
#include "../menu_setting.h"
#include "../../performance.h" #include "../../performance.h"
#include "../../intl/intl.h" #include "../../intl/intl.h"

1
menu/cbs/menu_entries_cbs_info.c
View File

@ -14,7 +14,6 @@
*/ */
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
static int action_info_default(unsigned type, const char *label) static int action_info_default(unsigned type, const char *label)
{ {

1
menu/cbs/menu_entries_cbs_iterate.c
View File

@ -20,7 +20,6 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_display.h" #include "../menu_display.h"
#include "../menu_entry.h" #include "../menu_entry.h"
#include "../menu_entries.h"
#include "../menu_setting.h" #include "../menu_setting.h"
#include "../menu_input.h" #include "../menu_input.h"
#include "../menu_shader.h" #include "../menu_shader.h"

6
menu/cbs/menu_entries_cbs_left.c
View File

@ -16,7 +16,6 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
#include "../menu_setting.h" #include "../menu_setting.h"
#include "../menu_shader.h" #include "../menu_shader.h"
#include "../menu_navigation.h" #include "../menu_navigation.h"
@ -136,6 +135,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
unsigned push_list = 0; unsigned push_list = 0;
menu_list_t *menu_list = menu_list_get_ptr(); menu_list_t *menu_list = menu_list_get_ptr();
menu_handle_t *menu = menu_driver_get_ptr(); menu_handle_t *menu = menu_driver_get_ptr();
menu_navigation_t *nav = menu_navigation_get_ptr();
unsigned action = MENU_ACTION_LEFT; unsigned action = MENU_ACTION_LEFT;
size_t list_size = menu_driver_list_get_size(MENU_LIST_PLAIN); size_t list_size = menu_driver_list_get_size(MENU_LIST_PLAIN);
if (!menu) if (!menu)
@ -143,7 +143,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
if (list_size == 1) if (list_size == 1)
{ {
menu->navigation.selection_ptr = 0; nav->selection_ptr = 0;
if (menu->categories.selection_ptr != 0) if (menu->categories.selection_ptr != 0)
push_list = 1; push_list = 1;
} }
@ -151,7 +151,7 @@ static int action_left_mainmenu(unsigned type, const char *label,
push_list = 2; push_list = 2;
cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf, cbs = menu_list_get_actiondata_at_offset(menu_list->selection_buf,
menu->navigation.selection_ptr); nav->selection_ptr);
switch (push_list) switch (push_list)
{ {

1
menu/cbs/menu_entries_cbs_ok.c
View File

@ -18,7 +18,6 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_display.h" #include "../menu_display.h"
#include "../menu_entries.h"
#include "../menu_setting.h" #include "../menu_setting.h"
#include "../menu_entry.h" #include "../menu_entry.h"
#include "../menu_shader.h" #include "../menu_shader.h"

1
menu/cbs/menu_entries_cbs_refresh.c
View File

@ -15,7 +15,6 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_displaylist.h" #include "../menu_displaylist.h"
#include "../menu_entries.h"
static int action_refresh_default(file_list_t *list, file_list_t *menu_list) static int action_refresh_default(file_list_t *list, file_list_t *menu_list)
{ {

1
menu/cbs/menu_entries_cbs_right.c
View File

@ -16,7 +16,6 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
#include "../menu_setting.h" #include "../menu_setting.h"
#include "../menu_shader.h" #include "../menu_shader.h"
#include "../menu_navigation.h" #include "../menu_navigation.h"

1
menu/cbs/menu_entries_cbs_scan.c
View File

@ -15,7 +15,6 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
#include "../menu_entry.h" #include "../menu_entry.h"
#include "../menu_setting.h" #include "../menu_setting.h"

1
menu/cbs/menu_entries_cbs_title.c
View File

@ -18,7 +18,6 @@
#include <file/file_path.h> #include <file/file_path.h>
#include "../menu.h" #include "../menu.h"
#include "../menu_entries.h"
static INLINE void replace_chars(char *str, char c1, char c2) static INLINE void replace_chars(char *str, char c1, char c2)
{ {

6
menu/cbs/menu_entries_cbs_up.c
View File

@ -15,21 +15,21 @@
#include "../menu.h" #include "../menu.h"
#include "../menu_navigation.h" #include "../menu_navigation.h"
#include "../menu_entries.h"
static int action_bind_up_generic(unsigned type, const char *label) static int action_bind_up_generic(unsigned type, const char *label)
{ {
unsigned scroll_speed = 0; unsigned scroll_speed = 0;
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) if (!menu)
return -1; return -1;
scroll_speed = (max(menu->navigation.scroll.acceleration, 2) - 2) / 4 + 1; scroll_speed = (max(nav->scroll.acceleration, 2) - 2) / 4 + 1;
if (menu_list_get_size(menu->menu_list) <= 0) if (menu_list_get_size(menu->menu_list) <= 0)
return 0; return 0;
menu_navigation_decrement(&menu->navigation, scroll_speed); menu_navigation_decrement(nav, scroll_speed);
return 0; return 0;
} }