diff --git a/menu/drivers/materialui.c b/menu/drivers/materialui.c index 1d3afb48b8..36c11395a1 100644 --- a/menu/drivers/materialui.c +++ b/menu/drivers/materialui.c @@ -68,8 +68,6 @@ enum #define MUI_SYSTEM_TAB_END MUI_SYSTEM_TAB_SETTINGS -typedef uintptr_t mui_texture_item; - typedef struct mui_handle { unsigned tabs_height; @@ -88,8 +86,8 @@ typedef struct mui_handle float alpha; } arrow; - mui_texture_item bg; - mui_texture_item list[MUI_TEXTURE_LAST]; + menu_texture_item bg; + menu_texture_item list[MUI_TEXTURE_LAST]; uintptr_t white; } textures; diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index 8acd4c86ad..f492960f49 100644 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -134,8 +134,6 @@ enum #define XMB_SYSTEM_TAB_END XMB_SYSTEM_TAB_HISTORY #endif -typedef uintptr_t xmb_texture_item; - typedef struct xmb_handle { file_list_t *menu_stack_old; @@ -190,8 +188,8 @@ typedef struct xmb_handle float alpha; } arrow; - xmb_texture_item bg; - xmb_texture_item list[XMB_TEXTURE_LAST]; + menu_texture_item bg; + menu_texture_item list[XMB_TEXTURE_LAST]; } textures; struct diff --git a/menu/drivers/zarch.c b/menu/drivers/zarch.c index a1e3575a38..79b74aa04e 100644 --- a/menu/drivers/zarch.c +++ b/menu/drivers/zarch.c @@ -56,8 +56,6 @@ #define ZUI_ITEM_SIZE_PX 54 #define NPARTICLES 100 -typedef uintptr_t zarch_texture_item; - enum zarch_zui_input_state { MENU_ZARCH_MOUSE_X = 0, @@ -131,8 +129,8 @@ typedef struct zarch_handle struct { - zarch_texture_item bg; - zarch_texture_item white; + menu_texture_item bg; + menu_texture_item white; } textures; /* LAY_ROOT's "Recent" */ diff --git a/menu/menu_display.h b/menu/menu_display.h index 87f384dd7e..573f33b681 100644 --- a/menu/menu_display.h +++ b/menu/menu_display.h @@ -169,6 +169,8 @@ typedef struct menu_display_ctx_font float size; } menu_display_ctx_font_t; +typedef uintptr_t menu_texture_item; + bool menu_display_ctl(enum menu_display_ctl_state state, void *data); void menu_display_handle_wallpaper_upload(void *task_data,