Create menu/widgets/menu_entry

This commit is contained in:
twinaphex 2016-09-15 00:20:43 +02:00
parent a8f407ac33
commit 02e01e0b0a
14 changed files with 19 additions and 15 deletions

View File

@ -505,12 +505,12 @@ ifeq ($(HAVE_MENU_COMMON), 1)
OBJ += menu/menu_driver.o \
menu/menu_content.o \
menu/menu_input.o \
menu/menu_entry.o \
menu/menu_entries.o \
menu/menu_navigation.o \
menu/menu_setting.o \
menu/menu_shader.o \
menu/widgets/menu_popup.o \
menu/widgets/menu_entry.o \
menu/widgets/menu_list.o \
menu/menu_cbs.o \
menu/cbs/menu_cbs_ok.o \

View File

@ -888,11 +888,11 @@ MENU
#ifdef HAVE_MENU
#include "../menu/menu_driver.c"
#include "../menu/menu_input.c"
#include "../menu/menu_entry.c"
#include "../menu/menu_entries.c"
#include "../menu/menu_setting.c"
#include "../menu/menu_cbs.c"
#include "../menu/menu_content.c"
#include "../menu/widgets/menu_entry.c"
#include "../menu/widgets/menu_popup.c"
#include "../menu/widgets/menu_list.c"
#include "../menu/cbs/menu_cbs_ok.c"

View File

@ -22,7 +22,6 @@
#include "../menu_driver.h"
#include "../menu_cbs.h"
#include "../menu_entry.h"
#include "../menu_setting.h"
#include "../../configuration.h"

View File

@ -20,7 +20,7 @@
#endif
#include "../menu_driver.h"
#include "../menu_entry.h"
#include "../widgets/menu_entry.h"
#include "../menu_cbs.h"
#include "../menu_setting.h"

View File

@ -36,7 +36,7 @@
#include "menu_generic.h"
#include "../menu_driver.h"
#include "../menu_entry.h"
#include "../widgets/menu_entry.h"
#include "../menu_animation.h"
#include "../menu_display.h"
#include "../menu_display.h"

View File

@ -32,7 +32,7 @@
#include "../menu_driver.h"
#include "../menu_animation.h"
#include "../menu_entry.h"
#include "../widgets/menu_entry.h"
#include "../menu_entries.h"
#include "../menu_input.h"
#include "../menu_navigation.h"

View File

@ -41,7 +41,7 @@
#include "../menu_driver.h"
#include "../menu_animation.h"
#include "../menu_entry.h"
#include "../widgets/menu_entry.h"
#include "../menu_display.h"
#include "../menu_navigation.h"
#include "../../retroarch.h"

View File

@ -19,6 +19,7 @@
#include <stdint.h>
#include <boolean.h>
#include <retro_miscellaneous.h>
#include <retro_common_api.h>
#include <lists/file_list.h>

View File

@ -26,6 +26,8 @@
#include <boolean.h>
#include <retro_common_api.h>
#include "widgets/menu_entry.h"
#include "menu_input.h"
#include "menu_entries.h"
#include "../gfx/video_shader_driver.h"

View File

@ -292,14 +292,15 @@ size_t menu_entries_get_end(void)
}
/* Get an entry from the top of the menu stack */
void menu_entries_get(size_t i, menu_entry_t *entry)
void menu_entries_get(size_t i, void *entry_data)
{
const char *label = NULL;
const char *path = NULL;
const char *entry_label = NULL;
menu_file_list_cbs_t *cbs = NULL;
enum msg_hash_enums enum_idx = MSG_UNKNOWN;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
menu_entry_t *entry = (menu_entry_t*)entry_data;
file_list_t *selection_buf = menu_entries_get_selection_buf_ptr(0);
menu_entries_get_last_stack(NULL, &label, NULL, &enum_idx, NULL);

View File

@ -23,7 +23,6 @@
#include <retro_common_api.h>
#include "menu_setting.h"
#include "menu_entry.h"
#include "menu_displaylist.h"
RETRO_BEGIN_DECLS
@ -132,7 +131,7 @@ typedef struct menu_file_list_cbs
size_t menu_entries_get_end(void);
void menu_entries_get(size_t i, menu_entry_t *entry);
void menu_entries_get(size_t i, void *data_entry);
int menu_entries_get_title(char *title, size_t title_len);

View File

@ -39,7 +39,7 @@
#include "menu_input.h"
#include "menu_animation.h"
#include "menu_display.h"
#include "menu_entry.h"
#include "widgets/menu_entry.h"
#include "menu_setting.h"
#include "menu_shader.h"
#include "menu_navigation.h"

View File

@ -18,8 +18,8 @@
#include <lists/string_list.h>
#include <string/stdstring.h>
#include "menu_driver.h"
#include "menu_navigation.h"
#include "../menu_driver.h"
#include "../menu_navigation.h"
/* This file provides an abstraction of the currently displayed
* menu.

View File

@ -22,7 +22,9 @@
#include <retro_common_api.h>
#include <retro_miscellaneous.h>
#include "menu_input.h"
#include "../../msg_hash.h"
#include "../menu_input.h"
RETRO_BEGIN_DECLS