mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-18 14:42:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

(MaterialUI) Backport r5 nvidia shield theme

Browse Source
This commit is contained in:
twinaphex 2016-07-11 00:55:07 +02:00
parent 2285797ef8
commit 4381c606d8
6 changed files with 34 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

@ -2129,6 +2129,8 @@ const char *msg_hash_to_str_us(enum msg_hash_enums msg)
return "Red"; return "Red";
case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW: case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW:
return "Yellow"; return "Yellow";
case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD:
return "Shield";
case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN: case MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN:
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:

5
menu/cbs/menu_cbs_get_value.c
View File

@ -821,6 +821,11 @@ static void menu_action_setting_disp_set_label_materialui_menu_color_theme(
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE), len); MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE), len);
break; break;
case MATERIALUI_THEME_NVIDIA_SHIELD:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD), len);
break;
default: default:
break; break;
} }

26
menu/drivers/materialui.c
View File

@ -799,6 +799,9 @@ static void mui_frame(void *data)
float blue_grey_500[16] = {0}; float blue_grey_500[16] = {0};
float blue_grey_50[16] = {0}; float blue_grey_50[16] = {0};
float yellow_200[16] = {0}; float yellow_200[16] = {0};
float color_nv_header[16] = {0};
float color_nv_body[16] = {0};
float color_nv_accent[16] = {0};
unsigned width = 0; unsigned width = 0;
unsigned height = 0; unsigned height = 0;
unsigned ticker_limit = 0; unsigned ticker_limit = 0;
@ -846,6 +849,9 @@ static void mui_frame(void *data)
hex32_to_rgba_normalized(0x607D8B, blue_grey_500, 1.00); hex32_to_rgba_normalized(0x607D8B, blue_grey_500, 1.00);
hex32_to_rgba_normalized(0xCFD8DC, blue_grey_50, 0.90); hex32_to_rgba_normalized(0xCFD8DC, blue_grey_50, 0.90);
hex32_to_rgba_normalized(0xC8E6C9, green_50, 0.90); hex32_to_rgba_normalized(0xC8E6C9, green_50, 0.90);
hex32_to_rgba_normalized(0x282F37, color_nv_header,1.00);
hex32_to_rgba_normalized(0x202427, color_nv_body, 1.00);
hex32_to_rgba_normalized(0x77B900, color_nv_accent,1.00);
clearcolor.r = 1.0f; clearcolor.r = 1.0f;
clearcolor.g = 1.0f; clearcolor.g = 1.0f;
@ -915,9 +921,23 @@ static void mui_frame(void *data)
TODO/FIXME - Maybe make this track the footer's bg color or vice-versa TODO/FIXME - Maybe make this track the footer's bg color or vice-versa
e.g. clearcolor.r = &footer_bg_color[0]; clearcolor.g = &footer_bg_color[4]; e.g. clearcolor.r = &footer_bg_color[0]; clearcolor.g = &footer_bg_color[4];
*/ */
clearcolor.r = 0.13f; clearcolor.r = 0.13f;
clearcolor.g = 0.13f; clearcolor.g = 0.13f;
clearcolor.b = 0.13f; clearcolor.b = 0.13f;
break;
case MATERIALUI_THEME_NVIDIA_SHIELD:
header_bg_color = color_nv_header;
body_bg_color = color_nv_body;
highlighted_entry_color = color_nv_accent;
footer_bg_color = color_nv_body;
active_tab_marker_color = color_nv_accent;
font_normal_color = 0xbbc0c4ff;
font_hover_color = 0xffffffff;
clearcolor.r = color_nv_body[0];
clearcolor.g = color_nv_body[1];
clearcolor.b = color_nv_body[2];
break; break;
} }

3
menu/menu_display.h
View File

@ -36,7 +36,8 @@ enum materialui_color_theme
MATERIALUI_THEME_DARK_BLUE, MATERIALUI_THEME_DARK_BLUE,
MATERIALUI_THEME_GREEN, MATERIALUI_THEME_GREEN,
MATERIALUI_THEME_RED, MATERIALUI_THEME_RED,
MATERIALUI_THEME_YELLOW MATERIALUI_THEME_YELLOW,
MATERIALUI_THEME_NVIDIA_SHIELD
}; };
enum menu_display_prim_type enum menu_display_prim_type

2
menu/menu_setting.c
View File

@ -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, 5, 1, true, true); menu_settings_list_current_add_range(list, list_info, 0, 6, 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);
} }

1
msg_hash.h
View File

@ -309,6 +309,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_RED,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_GREEN,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE,
MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,