Merge pull request #6379 from RobLoach/morningblue

xmb: Add Morning Blue theme
This commit is contained in:
Twinaphex 2018-03-12 02:49:51 +01:00 committed by GitHub
commit d170cb5469
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 32 additions and 9 deletions

View File

@ -1,4 +1,4 @@
MSG_HASH(
MSG_HASH(
MSG_COMPILER,
"Compiler"
)
@ -1849,6 +1849,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"Light")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
"Morning Blue")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

View File

@ -1849,6 +1849,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"Light")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
"Morning Blue")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

View File

@ -1,4 +1,4 @@
MSG_HASH(
MSG_HASH(
MSG_COMPILER,
"Compiler"
)
@ -1731,6 +1731,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"Light")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
"Morning Blue")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

View File

@ -1025,6 +1025,12 @@ static void menu_action_setting_disp_set_label_xmb_menu_color_theme(
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT),
len);
break;
case XMB_THEME_MORNING_BLUE:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE),
len);
break;
}
}

View File

@ -401,6 +401,13 @@ float gradient_light[16] = {
1.0, 1.0, 1.0, 1.00,
};
float gradient_morning_blue[16] = {
221/255.0, 241/255.0, 254/255.0, 1.00,
135/255.0, 206/255.0, 250/255.0, 1.00,
1.0, 1.0, 1.0, 1.00,
170/255.0, 200/255.0, 252/255.0, 1.00,
};
static void xmb_calculate_visible_range(const xmb_handle_t *xmb,
unsigned height, size_t list_size, unsigned current,
unsigned *first, unsigned *last);
@ -541,6 +548,8 @@ static float *xmb_gradient_ident(video_frame_info_t *video_info)
return &gradient_dark[0];
case XMB_THEME_LIGHT:
return &gradient_light[0];
case XMB_THEME_MORNING_BLUE:
return &gradient_morning_blue[0];
case XMB_THEME_LEGACY_RED:
default:
break;

View File

@ -242,6 +242,7 @@ enum xmb_color_theme
XMB_THEME_DARK,
XMB_THEME_LIGHT,
XMB_THEME_WALLPAPER,
XMB_THEME_MORNING_BLUE,
XMB_THEME_LAST
};

View File

@ -451,6 +451,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_PLAIN,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
MENU_LABEL(SHADER_PIPELINE_RIBBON_SIMPLIFIED),
MENU_LABEL(SHADER_PIPELINE_RIBBON),