Skip to content

Commit

Permalink
new ozone theme: solarized dark (#1)
Browse files Browse the repository at this point in the history
* feat: adding solarized dark theme to ozone

* fix: variable not defined in header

* fix: added string for selecting theme in menu

* fix: added message hash for string

* feat: copied solarized dark translations into msg hashes

* fix: forgot to change name of enum label after copying

* first pass of new colors

* added selection border and fixed sublabel color

* sublabel color from blue to muted gray

* trying cyan for sublabel

* adjusted selected text color to match philosophy from solarized website

* testing what the entries_ colors do

* chose colors for entries_, adjusted other border and bgs

* match selection border to sublabel color

* trying gray for sublabel

* accidentally put the color in the wrong place, reverting and updating

* trying to change selected option color to orange

* not feeling orange, lets try teal

* try for orange border

* try for magenta border

* try for violet border

* trying blue border again

* trying omar blue bc why not

* reverting to regular blue for icons and green for border

* try magenta for footer border

* trying font color for footer border

* trying to get message background to show

* can't get it to render, but changed message background to violet

* testing sidebar changes

* sidebar colors

* lighter sidebar color

* trying gray sidebar

* try a gradient

* screwed up one of the coordinates

* reversing gradient

* attempting gradient with colors i made up

* accidentally wrote gradient to dracula instead of solarized dark

* adding gradient to the top, reversing bottom gradient

* randomly trying shuffling bottom gradient coords

* moving top right coordinate somewhere else

* swapped top two bottom coords to see

* swapped them back, i got lucky and things were right

* think i figured out the order,  BL, BR, TL, TR

* making background gradient lil darker

* fixed coords

* lessening gradient effect

* lessening gradient effect, but by making darker instead of lighter

* of course, messed up two coords

* removed top and bottom gradients

* dark and flat sidebar

* forgot to change running background

* made running background a bit less transparent since this is a low contrast theme
  • Loading branch information
ofsaleem authored Oct 15, 2021
1 parent 6ccac53 commit 5226a06
Show file tree
Hide file tree
Showing 18 changed files with 136 additions and 2 deletions.
4 changes: 4 additions & 0 deletions intl/msg_hash_ar.h
Original file line number Diff line number Diff line change
Expand Up @@ -6265,6 +6265,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"قرصان القلوب"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"الظلام المشمس"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"الصورة المصغرة الثانية"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_chs.h
Original file line number Diff line number Diff line change
Expand Up @@ -8393,6 +8393,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"德古拉"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"暗色曝光"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"第二缩略图"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -8305,6 +8305,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
"Den Kernel hacken"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized dunkel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Zweites Vorschaubild"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -8529,6 +8529,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarizado (oscuro)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_fi.h
Original file line number Diff line number Diff line change
Expand Up @@ -8513,6 +8513,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Iltarusko"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized, tumma"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Toinen esikatselukuva"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -8537,6 +8537,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Quatrième dimension (Twilight Zone)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarisé sombre"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Miniature secondaire"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -8465,6 +8465,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
"Zona Crepuscolare"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Scuro Solarizzato"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Seconda Copertina"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_ko.h
Original file line number Diff line number Diff line change
Expand Up @@ -8609,6 +8609,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"드라큘라"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"솔라라이즈 다크"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"두 번째 미리보기"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_pl.h
Original file line number Diff line number Diff line change
Expand Up @@ -8481,6 +8481,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drakula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized ciemny"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Druga miniatura"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_pt_br.h
Original file line number Diff line number Diff line change
Expand Up @@ -8489,6 +8489,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drácula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Escuro solarizado"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -8621,6 +8621,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Дракула"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized тёмная"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Дополнительный эскиз"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -8617,6 +8617,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Drakula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarize Koyu"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"İkinci Küçük Resim"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -5129,6 +5129,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Дракула"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Салорайзед темна"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Додаткова мініатюра"
Expand Down
4 changes: 4 additions & 0 deletions intl/msg_hash_us.h
Original file line number Diff line number Diff line change
Expand Up @@ -9221,6 +9221,10 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
"Dracula"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized Dark"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Second Thumbnail"
Expand Down
75 changes: 73 additions & 2 deletions menu/drivers/ozone.c
Original file line number Diff line number Diff line change
Expand Up @@ -931,9 +931,36 @@ static float ozone_sidebar_gradient_bottom_dracula[16] = {
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
0.2666666, 0.2784314, 0.3529412, 1.0f,
};

static float ozone_background_libretro_running_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, .85f,
0.0000000, 0.1294118, 0.1725490, .85f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};

static float ozone_sidebar_background_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};

static float ozone_sidebar_gradient_top_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};

static float ozone_sidebar_gradient_bottom_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
0.0000000, 0.1294118, 0.1725490, 1.0f,
};

static float ozone_border_0_light[16] = COLOR_HEX_TO_FLOAT(0x50EFD9, 1.00);
static float ozone_border_1_light[16] = COLOR_HEX_TO_FLOAT(0x0DB6D5, 1.00);
Expand All @@ -959,6 +986,9 @@ static float ozone_border_1_twilight_zone[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0
static float ozone_border_0_dracula[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_dracula[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f);

static float ozone_border_0_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0xC3A0E0, 1.0f);
static float ozone_border_1_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0x9B61CC, 1.0f);

ozone_theme_t ozone_theme_light = {
COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00), /* background */
ozone_background_libretro_running_light, /* background_libretro_running */
Expand Down Expand Up @@ -1245,6 +1275,43 @@ ozone_theme_t ozone_theme_dracula = {
"dracula" /* name */
};

ozone_theme_t ozone_theme_solarized_dark = {
/* Background color */
COLOR_HEX_TO_FLOAT(0x002B36, 1.0f), /* background */
ozone_background_libretro_running_solarized_dark, /* background_libretro_running */

/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* text */
COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* selection */
COLOR_HEX_TO_FLOAT(0x2AA198, 1.0f), /* selection_border */
COLOR_HEX_TO_FLOAT(0x073642, 1.0f), /* entries_border */
COLOR_HEX_TO_FLOAT(0x268BD2, 1.0f), /* entries_icon */
COLOR_HEX_TO_FLOAT(0x93A1A1, 1.0f), /* text_selected */
COLOR_HEX_TO_FLOAT(0x6C71C4, 1.0f), /* message_background */

/* RGBA colors for text */
0x839496FF, /* text_rgba */
0x2AA198FF, /* text_selected_rgba */
0x586E75FF, /* text_sublabel_rgba */

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

/* Sidebar color */
ozone_sidebar_background_solarized_dark, /* sidebar_background */
ozone_sidebar_gradient_top_solarized_dark, /* sidebar_top_gradient */
ozone_sidebar_gradient_bottom_solarized_dark, /* sidebar_bottom_gradient */

/* Fancy cursor colors */
ozone_border_0_solarized_dark, /* cursor_border_0 */
ozone_border_1_solarized_dark, /* cursor_border_1 */

{0}, /* textures */

"solarized dark" /* name */

};

ozone_theme_t *ozone_themes[] = {
&ozone_theme_light,
Expand All @@ -1254,7 +1321,8 @@ ozone_theme_t *ozone_themes[] = {
&ozone_theme_boysenberry,
&ozone_theme_hacking_the_kernel,
&ozone_theme_twilight_zone,
&ozone_theme_dracula
&ozone_theme_dracula,
&ozone_theme_solarized_dark

};

Expand Down Expand Up @@ -1381,6 +1449,9 @@ static void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme)
case OZONE_COLOR_THEME_DRACULA:
theme = &ozone_theme_dracula;
break;
case OZONE_COLOR_THEME_SOLARIZED_DARK:
theme = &ozone_theme_solarized_dark;
break;
default:
break;
}
Expand Down
1 change: 1 addition & 0 deletions menu/menu_defines.h
Original file line number Diff line number Diff line change
Expand Up @@ -365,6 +365,7 @@ enum ozone_color_theme
OZONE_COLOR_THEME_HACKING_THE_KERNEL,
OZONE_COLOR_THEME_TWILIGHT_ZONE,
OZONE_COLOR_THEME_DRACULA,
OZONE_COLOR_THEME_SOLARIZED_DARK,
OZONE_COLOR_THEME_LAST
};

Expand Down
5 changes: 5 additions & 0 deletions menu/menu_setting.c
Original file line number Diff line number Diff line change
Expand Up @@ -4753,6 +4753,11 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme(
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA), len);
break;
case OZONE_COLOR_THEME_SOLARIZED_DARK:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK), len);
break;
case OZONE_COLOR_THEME_BASIC_WHITE:
default:
strlcpy(s,
Expand Down
1 change: 1 addition & 0 deletions msg_hash.h
Original file line number Diff line number Diff line change
Expand Up @@ -602,6 +602,7 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_HACKING_THE_KERNEL,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_TWILIGHT_ZONE,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_DRACULA,
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,

MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,
Expand Down

0 comments on commit 5226a06

Please sign in to comment.