From 2cd568cdaa8b325e72e2af6e90dabd8b8f0edb1c Mon Sep 17 00:00:00 2001 From: twinaphex Date: Tue, 6 Sep 2016 19:50:13 +0200 Subject: [PATCH] Use xmb_theme --- config.def.h | 4 ---- configuration.c | 2 +- menu/menu_setting.c | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/config.def.h b/config.def.h index 8126f2eec5..b4273caf8b 100644 --- a/config.def.h +++ b/config.def.h @@ -549,10 +549,6 @@ static float menu_footer_opacity = 1.000; static float menu_header_opacity = 1.000; -#if defined(HAVE_MATERIALUI) || defined(HAVE_XMB) -static unsigned menu_background_gradient = 4; -#endif - #if defined(HAVE_CG) || defined(HAVE_HLSL) || defined(HAVE_GLSL) || defined(HAVE_VULKAN) #if defined(HAVE_OPENGLES2) || defined(OSX_PPC) static unsigned menu_shader_pipeline = 1; diff --git a/configuration.c b/configuration.c index f32ecbcbcb..ffd026be2b 100644 --- a/configuration.c +++ b/configuration.c @@ -889,7 +889,7 @@ static int populate_settings_int(settings_t *settings, struct config_int_setting SETTING_INT("xmb_alpha_factor", &settings->menu.xmb.alpha_factor, true, xmb_alpha_factor, false); SETTING_INT("xmb_scale_factor", &settings->menu.xmb.scale_factor, true, xmb_scale_factor, false); SETTING_INT("xmb_theme", &settings->menu.xmb.theme, true, xmb_icon_theme, false); - SETTING_INT("xmb_menu_color_theme", &settings->menu.xmb.menu_color_theme, true, menu_background_gradient, false); + SETTING_INT("xmb_menu_color_theme", &settings->menu.xmb.menu_color_theme, true, xmb_theme, false); #endif SETTING_INT("materialui_menu_color_theme", &settings->menu.materialui.menu_color_theme, true, MATERIALUI_THEME_BLUE, false); #ifdef HAVE_SHADERPIPELINE diff --git a/menu/menu_setting.c b/menu/menu_setting.c index 3fe3b6d53a..9f97f0bd3a 100644 --- a/menu/menu_setting.c +++ b/menu/menu_setting.c @@ -5252,7 +5252,7 @@ static bool setting_append_list( &settings->menu.xmb.menu_color_theme, msg_hash_to_str(MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME), msg_hash_to_str(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME), - menu_background_gradient, + xmb_theme, &group_info, &subgroup_info, parent_group,