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

Merge pull request #9607 from jdgleaver/glui-colours

Browse Source 
(GLUI) Menu improvements (Round 1)
This commit is contained in:
Twinaphex 2019-10-16 19:06:00 +02:00 committed by GitHub
commit a127d2bf48
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 1260 additions and 667 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
intl/msg_hash_us.h
View File

@ -1734,6 +1734,14 @@ MSG_HASH(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
"Yellow" "Yellow"
) )
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI,
"Material UI"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK,
"Material UI Dark"
)
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_FOOTER_OPACITY,
"Footer Opacity" "Footer Opacity"

1902
menu/drivers/materialui.c
View File

File diff suppressed because it is too large Load Diff

2
menu/menu_defines.h
View File

@ -151,6 +151,8 @@ enum materialui_color_theme
MATERIALUI_THEME_RED, MATERIALUI_THEME_RED,
MATERIALUI_THEME_YELLOW, MATERIALUI_THEME_YELLOW,
MATERIALUI_THEME_NVIDIA_SHIELD, MATERIALUI_THEME_NVIDIA_SHIELD,
MATERIALUI_THEME_MATERIALUI,
MATERIALUI_THEME_MATERIALUI_DARK,
MATERIALUI_THEME_LAST MATERIALUI_THEME_LAST
}; };

13
menu/menu_setting.c
View File

@ -3853,6 +3853,16 @@ static void setting_get_string_representation_uint_materialui_menu_color_theme(
msg_hash_to_str( msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD), len); MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD), len);
break; break;
case MATERIALUI_THEME_MATERIALUI:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI), len);
break;
case MATERIALUI_THEME_MATERIALUI_DARK:
strlcpy(s,
msg_hash_to_str(
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK), len);
break;
default: default:
break; break;
} }
@ -12849,6 +12859,8 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_THEME_LAST-1, 1, true, true); menu_settings_list_current_add_range(list, list_info, 0, MATERIALUI_THEME_LAST-1, 1, true, true);
(*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX; (*list)[list_info->index - 1].ui_type = ST_UI_TYPE_UINT_COMBOBOX;
/* TODO: These should be removed entirely, but just
* comment out for now in case users complain...
CONFIG_FLOAT( CONFIG_FLOAT(
list, list_info, list, list_info,
&settings->floats.menu_header_opacity, &settings->floats.menu_header_opacity,
@ -12880,6 +12892,7 @@ static bool setting_append_list(
menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true); menu_settings_list_current_add_range(list, list_info, 0.0, 1.0, 0.010, true, true);
(*list)[list_info->index - 1].ui_type (*list)[list_info->index - 1].ui_type
= ST_UI_TYPE_FLOAT_SLIDER_AND_SPINBOX; = ST_UI_TYPE_FLOAT_SLIDER_AND_SPINBOX;
*/
} }
#endif #endif

2
msg_hash.h
View File

@ -599,6 +599,8 @@ enum msg_hash_enums
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_YELLOW,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_NVIDIA_SHIELD,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE, MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_DARK_BLUE,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI,
MENU_ENUM_LABEL_VALUE_MATERIALUI_MENU_COLOR_THEME_MATERIALUI_DARK,
MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_LATE,
MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL, MENU_ENUM_LABEL_VALUE_INPUT_POLL_TYPE_BEHAVIOR_NORMAL,