mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-06 18:40:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add 'Wallpaper' color theme for XMB too

Browse Source
This commit is contained in:
twinaphex 2016-07-14 18:29:05 +02:00
parent 401eb7bc7a
commit 664f90b023
7 changed files with 26 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
intl/msg_hash_us.c
View File

@ -2146,6 +2146,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
return "Green"; return "Green";
case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE: case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE:
return "Dark Blue"; return "Dark Blue";
case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_WALLPAPER:
return "Wallpaper";
case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED: case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LEGACY_RED:
return "Legacy Red"; return "Legacy Red";
case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE: case MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE:

6
menu/cbs/menu_cbs_get_value.c
View File

@ -715,6 +715,12 @@ static void menu_action_setting_disp_set_label_xmb_menu_color_theme(
switch (settings->menu.xmb.menu_color_theme) switch (settings->menu.xmb.menu_color_theme)
{ {
case XMB_THEME_WALLPAPER:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_WALLPAPER),
len);
break;
case XMB_THEME_LEGACY_RED: case XMB_THEME_LEGACY_RED:
strlcpy(s, strlcpy(s,
msg_hash_to_str( msg_hash_to_str(

4
menu/drivers/xmb.c
View File

@ -1925,7 +1925,9 @@ static void xmb_draw_bg(
menu_display_set_viewport(); menu_display_set_viewport();
#ifdef HAVE_SHADERPIPELINE #ifdef HAVE_SHADERPIPELINE
if (settings->menu.xmb.shader_pipeline > 0) if (settings->menu.xmb.shader_pipeline > 0
&&
(settings->menu.xmb.menu_color_theme != XMB_THEME_WALLPAPER))
{ {
draw.color = xmb_gradient_ident(); draw.color = xmb_gradient_ident();

7
menu/menu_display.c
View File

@ -498,6 +498,7 @@ void menu_display_draw_bg(menu_display_ctx_draw_t *draw)
static struct video_coords coords; static struct video_coords coords;
const float *new_vertex = NULL; const float *new_vertex = NULL;
const float *new_tex_coord = NULL; const float *new_tex_coord = NULL;
bool add_opacity_to_wallpaper = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
if (!menu_disp || !draw) if (!menu_disp || !draw)
return; return;
@ -519,6 +520,12 @@ void menu_display_draw_bg(menu_display_ctx_draw_t *draw)
draw->coords = &coords; draw->coords = &coords;
if (!menu_display_libretro_running() && !menu_display_shader_pipeline_active()) if (!menu_display_libretro_running() && !menu_display_shader_pipeline_active())
add_opacity_to_wallpaper = true;
if (string_is_equal(menu_driver_ident(), "xmb")
&& settings->menu.xmb.menu_color_theme == XMB_THEME_WALLPAPER)
add_opacity_to_wallpaper = true;
if (add_opacity_to_wallpaper)
menu_display_set_alpha(draw->color, settings->menu.wallpaper.opacity); menu_display_set_alpha(draw->color, settings->menu.wallpaper.opacity);
if (!draw->texture) if (!draw->texture)

7
menu/menu_display.h
View File

@ -37,7 +37,8 @@ enum materialui_color_theme
MATERIALUI_THEME_GREEN, MATERIALUI_THEME_GREEN,
MATERIALUI_THEME_RED, MATERIALUI_THEME_RED,
MATERIALUI_THEME_YELLOW, MATERIALUI_THEME_YELLOW,
MATERIALUI_THEME_NVIDIA_SHIELD MATERIALUI_THEME_NVIDIA_SHIELD,
MATERIALUI_THEME_LAST
}; };
enum xmb_color_theme enum xmb_color_theme
@ -50,7 +51,9 @@ enum xmb_color_theme
XMB_THEME_APPLE_GREEN, XMB_THEME_APPLE_GREEN,
XMB_THEME_UNDERSEA, XMB_THEME_UNDERSEA,
XMB_THEME_VOLCANIC_RED, XMB_THEME_VOLCANIC_RED,
XMB_THEME_DARK XMB_THEME_DARK,
XMB_THEME_WALLPAPER,
XMB_THEME_LAST
}; };
enum menu_display_prim_type enum menu_display_prim_type

4
menu/menu_setting.c
View File

@ -6946,7 +6946,7 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 8, 1, true, true); menu_settings_list_current_add_range(list, list_info, 0, XMB_THEME_LAST-1, 1, true, true);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_XMB_MENU_COLOR_THEME);
} }
@ -6964,7 +6964,7 @@ static bool setting_append_list(
parent_group, parent_group,
general_write_handler, general_write_handler,
general_read_handler); general_read_handler);
menu_settings_list_current_add_range(list, list_info, 0, 6, 1, true, true); menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_THEME_LAST-1, 1, true, true);
menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME); menu_settings_list_current_add_enum_idx(list, list_info, MENU_ENUM_LABEL_MATERIALUI_MENU_COLOR_THEME);
CONFIG_FLOAT( CONFIG_FLOAT(

1
msg_hash.h
View File

@ -300,6 +300,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA, MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_UNDERSEA,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED, MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_VOLCANIC_RED,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK, MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_WALLPAPER,
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED, MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON_SIMPLIFIED,
MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON, MENU_ENUM_LABEL_VALUE_SHADER_PIPELINE_RIBBON,