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

Merge pull request #6379 from RobLoach/morningblue

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_ar.h
View File

@ -1,4 +1,4 @@
MSG_HASH( MSG_HASH(
MSG_COMPILER, MSG_COMPILER,
"Compiler" "Compiler"
) )
@ -1849,6 +1849,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark") "Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"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, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple") "Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

2
intl/msg_hash_us.h
View File

@ -1849,6 +1849,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark") "Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"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, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple") "Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

4
intl/msg_hash_vn.h
View File

@ -1,4 +1,4 @@
MSG_HASH( MSG_HASH(
MSG_COMPILER, MSG_COMPILER,
"Compiler" "Compiler"
) )
@ -1731,6 +1731,8 @@ MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK,
"Dark") "Dark")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT,
"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, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_DARK_PURPLE,
"Dark Purple") "Dark Purple")
MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE, MSG_HASH(MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_ELECTRIC_BLUE,

8
menu/cbs/menu_cbs_get_value.c
View File

@ -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 *shader = menu_shader_get();
struct video_shader_parameter *param = shader ? 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; : NULL;
*s = '\0'; *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), MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT),
len); len);
break; break;
case XMB_THEME_MORNING_BLUE:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE),
len);
break;
} }
} }

21
menu/drivers/xmb.c
View File

@ -401,6 +401,13 @@ float gradient_light[16] = {
1.0, 1.0, 1.0, 1.00, 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, static void xmb_calculate_visible_range(const xmb_handle_t *xmb,
unsigned height, size_t list_size, unsigned current, unsigned height, size_t list_size, unsigned current,
unsigned *first, unsigned *last); unsigned *first, unsigned *last);
@ -541,6 +548,8 @@ static float *xmb_gradient_ident(video_frame_info_t *video_info)
return &gradient_dark[0]; return &gradient_dark[0];
case XMB_THEME_LIGHT: case XMB_THEME_LIGHT:
return &gradient_light[0]; return &gradient_light[0];
case XMB_THEME_MORNING_BLUE:
return &gradient_morning_blue[0];
case XMB_THEME_LEGACY_RED: case XMB_THEME_LEGACY_RED:
default: default:
break; break;
@ -901,7 +910,7 @@ static void xmb_render_messagebox_internal(
float line_height = 0; float line_height = 0;
unsigned width = video_info->width; unsigned width = video_info->width;
unsigned height = video_info->height; 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; ? string_split(message, "\n") : NULL;
if (!list || !xmb || !xmb->font) 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 */ /* 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) 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])); ((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])); ((1040 - xmb->margins_screen_top - xmb->icon_size) / (xmb->thumbnail_height * scale_mod[4]));
} }
else else
@ -4505,7 +4514,7 @@ static int xmb_list_push(void *data, void *userdata,
snprintf(s, sizeof(s), snprintf(s, sizeof(s),
"Load %s %s", "Load %s %s",
subsystem->desc, subsystem->desc,
i == content_get_subsystem() i == content_get_subsystem()
? "\u2605" : " "); ? "\u2605" : " ");
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
s, s,
@ -4518,7 +4527,7 @@ static int xmb_list_push(void *data, void *userdata,
snprintf(s, sizeof(s), snprintf(s, sizeof(s),
"Start %s %s", "Start %s %s",
subsystem->desc, subsystem->desc,
i == content_get_subsystem() i == content_get_subsystem()
? "\u2605" : " "); ? "\u2605" : " ");
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
s, s,
@ -4532,7 +4541,7 @@ static int xmb_list_push(void *data, void *userdata,
snprintf(s, sizeof(s), snprintf(s, sizeof(s),
"Load %s %s", "Load %s %s",
subsystem->desc, subsystem->desc,
i == content_get_subsystem() i == content_get_subsystem()
? "\u2605" : " "); ? "\u2605" : " ");
menu_entries_append_enum(info->list, menu_entries_append_enum(info->list,
s, s,

1
menu/menu_driver.h
View File

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

1
msg_hash.h
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_DARK,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_LIGHT, 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_PLAIN,
MENU_ENUM_LABEL_VALUE_XMB_MENU_COLOR_THEME_MORNING_BLUE,
MENU_LABEL(SHADER_PIPELINE_RIBBON_SIMPLIFIED), MENU_LABEL(SHADER_PIPELINE_RIBBON_SIMPLIFIED),
MENU_LABEL(SHADER_PIPELINE_RIBBON), MENU_LABEL(SHADER_PIPELINE_RIBBON),