Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ozone theme: mei #15394

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

ozone theme: mei #15394

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions intl/msg_hash_us.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11468,6 +11468,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_PURPLE_RAIN,
"Purple Rain"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_MEI,
"Mei"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Second Thumbnail"
Expand Down
77 changes: 76 additions & 1 deletion menu/drivers/ozone.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -792,6 +792,20 @@ static float ozone_sidebar_gradient_bottom_solarized_light[16] = {
1.0000000f, 1.0000000f, 0.9294118f, 1.0f,
};

static float ozone_sidebar_gradient_top_mei[16] = {
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
};

static float ozone_sidebar_gradient_bottom_mei[16] = {
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
};

static float ozone_sidebar_background_gray_dark[16] =
COLOR_HEX_TO_FLOAT(0x101010, 0.0f);

Expand Down Expand Up @@ -875,6 +889,14 @@ static float ozone_sidebar_background_purple_rain[16] = {
0.0862745f, 0.0f, 0.1294117f, 1.0f,
};

static float ozone_sidebar_background_mei[16] = {
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
};


static float ozone_background_libretro_running_gray_dark[16] =
COLOR_HEX_TO_FLOAT(0x101010, 1.0f);

Expand Down Expand Up @@ -958,6 +980,14 @@ static float ozone_background_libretro_running_purple_rain[16] = {
0.0862745f, 0.0f, 0.1294117f, 1.0f,
};

static float ozone_background_libretro_running_mei[16] = {
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
0.6039215f, 0.0627450f, 0.0627450f, 1.0f,
};


static float ozone_border_gray[16] = COLOR_HEX_TO_FLOAT(0x303030, 1.0f);

static float ozone_border_0_light[16] = COLOR_HEX_TO_FLOAT(0x50EFD9, 1.00);
Expand Down Expand Up @@ -993,6 +1023,9 @@ static float ozone_border_1_solarized_light[16] = COLOR_HEX_TO_FLOAT(0xDC322F
static float ozone_border_0_purple_rain[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_purple_rain[16] = COLOR_HEX_TO_FLOAT(0x8C3DCC, 1.0f);

static float ozone_border_0_mei[16] = COLOR_HEX_TO_FLOAT(0xf4eb1a, 1.0f);
static float ozone_border_1_mei[16] = COLOR_HEX_TO_FLOAT(0xC3BC15, 1.0f);

static ozone_theme_t ozone_theme_light = {
COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00f), /* background */
ozone_background_libretro_running_light, /* background_libretro_running */
Expand Down Expand Up @@ -1480,6 +1513,44 @@ static ozone_theme_t ozone_theme_purple_rain = {
"purple_rain" /* name */
};

static ozone_theme_t ozone_theme_mei = {
/* Background color */
COLOR_HEX_TO_FLOAT(0x9A1010, 1.0f), /* background */
ozone_background_libretro_running_mei, /* background_libretro_running */

/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0xe1d921, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0xf90000, 1.0f), /* text */
COLOR_HEX_TO_FLOAT(0xf90000, 1.0f), /* selection */
COLOR_HEX_TO_FLOAT(0xe79516, 1.0f), /* selection_border */
COLOR_HEX_TO_FLOAT(0x9a1010, 1.0f), /* entries_border */
COLOR_HEX_TO_FLOAT(0xf4eb1a, 1.0f), /* entries_icon */
COLOR_HEX_TO_FLOAT(0xe1d921, 1.0f), /* text_selected */
COLOR_HEX_TO_FLOAT(0xe1d921, 1.0f), /* message_background */

/* RGBA colors for text */
0xFFFFFFFF, /* text_rgba */
0xFFFFFFFF, /* text_sidebar_rgba */
0xFFFFFFFF, /* text_selected_rgba */
0xFFFFFFFF, /* text_sublabel_rgba */

/* Screensaver 'tint' (RGB24) */
0xFFFFFF, /* screensaver_tint */

/* Sidebar color */
ozone_sidebar_background_mei, /* sidebar_background */
ozone_sidebar_gradient_top_mei, /* sidebar_top_gradient */
ozone_sidebar_gradient_bottom_mei, /* sidebar_bottom_gradient */

/* Fancy cursor colors */
ozone_border_0_mei, /* cursor_border_0 */
ozone_border_1_mei, /* cursor_border_1 */

{0}, /* textures */

"mei" /* name */
};

static ozone_theme_t *ozone_themes[] = {
&ozone_theme_light,
&ozone_theme_dark,
Expand All @@ -1493,7 +1564,8 @@ static ozone_theme_t *ozone_themes[] = {
&ozone_theme_solarized_light,
&ozone_theme_gray_dark,
&ozone_theme_gray_light,
&ozone_theme_purple_rain
&ozone_theme_purple_rain,
&ozone_theme_mei
};

/* TODO/FIXME - global variables referenced outside */
Expand Down Expand Up @@ -1628,6 +1700,9 @@ static void ozone_set_color_theme(
case OZONE_COLOR_THEME_PURPLE_RAIN:
theme = &ozone_theme_purple_rain;
break;
case OZONE_COLOR_THEME_MEI:
theme = &ozone_theme_mei;
break;
default:
break;
}
Expand Down
1 change: 1 addition & 0 deletions menu/menu_defines.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,6 +385,7 @@ enum ozone_color_theme
OZONE_COLOR_THEME_GRAY_DARK,
OZONE_COLOR_THEME_GRAY_LIGHT,
OZONE_COLOR_THEME_PURPLE_RAIN,
OZONE_COLOR_THEME_MEI,
OZONE_COLOR_THEME_LAST
};

Expand Down
5 changes: 5 additions & 0 deletions menu/menu_setting.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4680,6 +4680,11 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme(
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_PURPLE_RAIN), len);
break;
case OZONE_COLOR_THEME_MEI:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_MEI), len);
break;
case OZONE_COLOR_THEME_BASIC_WHITE:
default:
strlcpy(s,
Expand Down
1 change: 1 addition & 0 deletions msg_hash.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -706,6 +706,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_DARK,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_GRAY_LIGHT,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_PURPLE_RAIN,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_MEI,

MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
Expand Down