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

Revert "Solarized light (#3)"

Browse Source 
This reverts commit 485d07691de5f8c766c3d24a6f3a2a10ed2a7fd9.
This commit is contained in:
Omar Saleem 2021-10-15 23:51:25 -04:00
parent 485d07691d
commit 64dabb0388
18 changed files with 4 additions and 137 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_ar.h
View File

@ -6269,10 +6269,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"الظلام المشمس"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"النور المشمس"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"الصورة المصغرة الثانية"

4
intl/msg_hash_chs.h
View File

@ -8397,10 +8397,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"暗色曝光"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"亮色曝光"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"第二缩略图"

4
intl/msg_hash_de.h
View File

@ -8309,10 +8309,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized dunkel"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarized hell"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Zweites Vorschaubild"

4
intl/msg_hash_es.h
View File

@ -8533,10 +8533,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarizado (oscuro)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarizado (claro)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

5
intl/msg_hash_fi.h
View File

@ -8517,11 +8517,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized, tumma"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarized, vaalea"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Toinen esikatselukuva"

5
intl/msg_hash_fr.h
View File

@ -8541,11 +8541,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarisé sombre"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarisé clair"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Miniature secondaire"

4
intl/msg_hash_it.h
View File

@ -8469,10 +8469,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Scuro Solarizzato"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Chiaro Solarizzato"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Seconda Copertina"

4
intl/msg_hash_ko.h
View File

@ -8613,10 +8613,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"솔라라이즈 다크"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"솔라라이즈 라이트"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"두 번째 미리보기"

4
intl/msg_hash_pl.h
View File

@ -8485,10 +8485,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized ciemny"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarized jasny"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Druga miniatura"

4
intl/msg_hash_pt_br.h
View File

@ -8493,10 +8493,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Escuro solarizado"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarizado (claro)"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Segunda miniatura"

4
intl/msg_hash_ru.h
View File

@ -8625,10 +8625,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized тёмная"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarized светлая"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Дополнительный эскиз"

4
intl/msg_hash_tr.h
View File

@ -8621,10 +8621,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarize Koyu"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarize Açık"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"İkinci Küçük Resim"

4
intl/msg_hash_uk.h
View File

@ -5133,10 +5133,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Салорайзед темна"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Салорайзед світла"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Додаткова мініатюра"

4
intl/msg_hash_us.h
View File

@ -9225,10 +9225,6 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK,
"Solarized Dark"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
"Solarized Light"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_OZONE,
"Second Thumbnail"

76
menu/drivers/ozone.c
View File

@ -962,31 +962,6 @@ static float ozone_sidebar_gradient_bottom_solarized_dark[16] = {
0.0000000, 0.1294118, 0.1725490, 1.0f,
};
static float ozone_background_libretro_running_solarized_light[16] = {
1.0000000, 1.0000000, 0.9294118, 0.85f,
1.0000000, 1.0000000, 0.9294118, 0.85f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
};
static float ozone_sidebar_background_solarized_light[16] = {
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
};
static float ozone_sidebar_gradient_top_solarized_light[16] = {
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
};
static float ozone_sidebar_gradient_bottom_solarized_light[16] = {
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 1.0f,
1.0000000, 1.0000000, 0.9294118, 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);
@ -1014,9 +989,6 @@ 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(0x67ECE2, 1.0f);
static float ozone_border_1_solarized_dark[16] = COLOR_HEX_TO_FLOAT(0x2AA198, 1.0f);
static float ozone_border_0_solarized_light[16] = COLOR_HEX_TO_FLOAT(0x8F120F, 1.0f);
static float ozone_border_1_solarized_light[16] = COLOR_HEX_TO_FLOAT(0xDC322F, 1.0f);
ozone_theme_t ozone_theme_light = {
COLOR_HEX_TO_FLOAT(0xEBEBEB, 1.00), /* background */
ozone_background_libretro_running_light, /* background_libretro_running */
@ -1310,7 +1282,7 @@ ozone_theme_t ozone_theme_solarized_dark = {
/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0x839496, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0x93A1A1, 1.0f), /* text */
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 */
@ -1319,9 +1291,9 @@ ozone_theme_t ozone_theme_solarized_dark = {
COLOR_HEX_TO_FLOAT(0x002B36, 1.0f), /* message_background */
/* RGBA colors for text */
0x93A1A1FF, /* text_rgba */
0x839496FF, /* text_rgba */
0x2AA198FF, /* text_selected_rgba */
0x657B83FF, /* text_sublabel_rgba */
0x586E75FF, /* text_sublabel_rgba */
/* Screensaver 'tint' (RGB24) */
0x073642, /* screensaver_tint */
@ -1338,43 +1310,7 @@ ozone_theme_t ozone_theme_solarized_dark = {
{0}, /* textures */
"solarized_dark" /* name */
};
ozone_theme_t ozone_theme_solarized_light = {
/* Background color */
COLOR_HEX_TO_FLOAT(0xFDF6E3, 1.0f), /* background */
ozone_background_libretro_running_solarized_light, /* background_libretro_running */
/* Float colors for quads and icons */
COLOR_HEX_TO_FLOAT(0x657B83, 1.0f), /* header_footer_separator */
COLOR_HEX_TO_FLOAT(0x586E75, 1.0f), /* text */
COLOR_HEX_TO_FLOAT(0xEEE8D5, 1.0f), /* selection */
COLOR_HEX_TO_FLOAT(0xDC322F, 1.0f), /* selection_border */
COLOR_HEX_TO_FLOAT(0xEEE8D5, 1.0f), /* entries_border */
COLOR_HEX_TO_FLOAT(0xCB4B16, 1.0f), /* entries_icon */
COLOR_HEX_TO_FLOAT(0x586E75, 1.0f), /* text_selected */
COLOR_HEX_TO_FLOAT(0xFDF6E3, 1.0f), /* message_background */
/* RGBA colors for text */
0x586E75FF, /* text_rgba */
0xDC322FFF, /* text_selected_rgba */
0x839496FF, /* text_sublabel_rgba */
/* Screensaver 'tint' (RGB24) */
0xEEE8D5, /* screensaver_tint */
/* Sidebar color */
ozone_sidebar_background_solarized_light, /* sidebar_background */
ozone_sidebar_gradient_top_solarized_light, /* sidebar_top_gradient */
ozone_sidebar_gradient_bottom_solarized_light, /* sidebar_bottom_gradient */
/* Fancy cursor colors */
ozone_border_0_solarized_light, /* cursor_border_0 */
ozone_border_1_solarized_light, /* cursor_border_1 */
{0}, /* textures */
"solarized_light" /* name */
};
ozone_theme_t *ozone_themes[] = {
@ -1386,8 +1322,7 @@ ozone_theme_t *ozone_themes[] = {
&ozone_theme_hacking_the_kernel,
&ozone_theme_twilight_zone,
&ozone_theme_dracula,
&ozone_theme_solarized_dark,
&ozone_theme_solarized_light
&ozone_theme_solarized_dark
};
@ -1517,9 +1452,6 @@ static void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme)
case OZONE_COLOR_THEME_SOLARIZED_DARK:
theme = &ozone_theme_solarized_dark;
break;
case OZONE_COLOR_THEME_SOLARIZED_LIGHT:
theme = &ozone_theme_solarized_light;
break;
default:
break;
}

1
menu/menu_defines.h
View File

@ -366,7 +366,6 @@ enum ozone_color_theme
OZONE_COLOR_THEME_TWILIGHT_ZONE,
OZONE_COLOR_THEME_DRACULA,
OZONE_COLOR_THEME_SOLARIZED_DARK,
OZONE_COLOR_THEME_SOLARIZED_LIGHT,
OZONE_COLOR_THEME_LAST
};

5
menu/menu_setting.c
View File

@ -4758,11 +4758,6 @@ static void setting_get_string_representation_uint_ozone_menu_color_theme(
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_DARK), len);
break;
case OZONE_COLOR_THEME_SOLARIZED_LIGHT:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_OZONE_COLOR_THEME_SOLARIZED_LIGHT), len);
break;
case OZONE_COLOR_THEME_BASIC_WHITE:
default:
strlcpy(s,

1
msg_hash.h
View File

@ -603,7 +603,6 @@ enum msg_hash_enums
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_OZONE_COLOR_THEME_SOLARIZED_LIGHT,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME,
MENU_ENUM_LABEL_VALUE_XMB_ICON_THEME_MONOCHROME_INVERTED,