From ddb0f81cf23642b5b68ba9e7ba82ea23dc9ca2d0 Mon Sep 17 00:00:00 2001 From: Rob Loach Date: Sun, 11 Mar 2018 20:37:49 -0400 Subject: [PATCH] xmb: Add Morning Blue theme --- intl/msg_hash_ar.h | 4 +++- intl/msg_hash_us.h | 2 ++ intl/msg_hash_vn.h | 4 +++- menu/cbs/menu_cbs_get_value.c | 8 +++++++- menu/drivers/xmb.c | 21 +++++++++++++++------ menu/menu_driver.h | 1 + msg_hash.h | 1 + 7 files changed, 32 insertions(+), 9 deletions(-) diff --git a/intl/msg_hash_ar.h b/intl/msg_hash_ar.h index 740bf303ec..3b3a300812 100644 --- a/intl/msg_hash_ar.h +++ b/intl/msg_hash_ar.h @@ -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, diff --git a/intl/msg_hash_us.h b/intl/msg_hash_us.h index 50a67452e4..495e166a78 100644 --- a/intl/msg_hash_us.h +++ b/intl/msg_hash_us.h @@ -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, diff --git a/intl/msg_hash_vn.h b/intl/msg_hash_vn.h index c8eb72e9cd..b46742834e 100644 --- a/intl/msg_hash_vn.h +++ b/intl/msg_hash_vn.h @@ -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, diff --git a/menu/cbs/menu_cbs_get_value.c b/menu/cbs/menu_cbs_get_value.c index 3d9a546c84..ec8c1b4005 100644 --- a/menu/cbs/menu_cbs_get_value.c +++ b/menu/cbs/menu_cbs_get_value.c @@ -474,7 +474,7 @@ static void menu_action_setting_disp_set_label_shader_preset_parameter( { struct video_shader *shader = menu_shader_get(); struct video_shader_parameter *param = shader ? - &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0] + &shader->parameters[type - MENU_SETTINGS_SHADER_PRESET_PARAMETER_0] : NULL; *s = '\0'; @@ -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; } } diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c index b859701c78..f72308b627 100755 --- a/menu/drivers/xmb.c +++ b/menu/drivers/xmb.c @@ -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; @@ -901,7 +910,7 @@ static void xmb_render_messagebox_internal( float line_height = 0; unsigned width = video_info->width; unsigned height = video_info->height; - struct string_list *list = !string_is_empty(message) + struct string_list *list = !string_is_empty(message) ? string_split(message, "\n") : NULL; if (!list || !xmb || !xmb->font) @@ -3019,9 +3028,9 @@ static void xmb_frame(void *data, video_frame_info_t *video_info) /* Resize thumbnail if its height cross the bottom of the screen */ if(xmb->margins_screen_top + xmb->icon_size + xmb->thumbnail_height * scale_mod[4] >= 1040) { - thumb_width = xmb->thumbnail_width * + thumb_width = xmb->thumbnail_width * ((1040 - xmb->margins_screen_top - xmb->icon_size) / (xmb->thumbnail_height * scale_mod[4])); - thumb_height = xmb->thumbnail_height * + thumb_height = xmb->thumbnail_height * ((1040 - xmb->margins_screen_top - xmb->icon_size) / (xmb->thumbnail_height * scale_mod[4])); } else @@ -4505,7 +4514,7 @@ static int xmb_list_push(void *data, void *userdata, snprintf(s, sizeof(s), "Load %s %s", subsystem->desc, - i == content_get_subsystem() + i == content_get_subsystem() ? "\u2605" : " "); menu_entries_append_enum(info->list, s, @@ -4518,7 +4527,7 @@ static int xmb_list_push(void *data, void *userdata, snprintf(s, sizeof(s), "Start %s %s", subsystem->desc, - i == content_get_subsystem() + i == content_get_subsystem() ? "\u2605" : " "); menu_entries_append_enum(info->list, s, @@ -4532,7 +4541,7 @@ static int xmb_list_push(void *data, void *userdata, snprintf(s, sizeof(s), "Load %s %s", subsystem->desc, - i == content_get_subsystem() + i == content_get_subsystem() ? "\u2605" : " "); menu_entries_append_enum(info->list, s, diff --git a/menu/menu_driver.h b/menu/menu_driver.h index bc545810f4..c939286073 100644 --- a/menu/menu_driver.h +++ b/menu/menu_driver.h @@ -242,6 +242,7 @@ enum xmb_color_theme XMB_THEME_DARK, XMB_THEME_LIGHT, XMB_THEME_WALLPAPER, + XMB_THEME_MORNING_BLUE, XMB_THEME_LAST }; diff --git a/msg_hash.h b/msg_hash.h index d30d2b6e08..b7fe8b6d4d 100644 --- a/msg_hash.h +++ b/msg_hash.h @@ -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),