libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-27 18:20:27 +00:00
Code Issues Actions 65 Packages Projects Releases Wiki Activity

(XMB+Ozone) Core option category icon refinements (#14354)

Browse Source
This commit is contained in:
sonninnos 2022-08-26 17:11:36 +03:00 committed by GitHub
parent 7507e20703
commit 1f048dd358
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 73 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
intl/msg_hash_us.h
View File

@ -1289,6 +1289,40 @@ MSG_HASH(
"Change default directories where files are located."
)
/* Core option category placeholders for icons */
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MAPPING_SETTINGS,
"Mapping"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_MEDIA_SETTINGS,
"Media"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_PERFORMANCE_SETTINGS,
"Performance"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SOUND_SETTINGS,
"Sound"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SPECS_SETTINGS,
"Specs"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_STORAGE_SETTINGS,
"Storage"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_SYSTEM_SETTINGS,
"System"
)
MSG_HASH(
MENU_ENUM_LABEL_VALUE_TIMING_SETTINGS,
"Timing"
)
#ifdef HAVE_MIST
MSG_HASH(
MENU_ENUM_LABEL_VALUE_STEAM_SETTINGS,

21
menu/drivers/ozone.c
View File

@ -2103,20 +2103,29 @@ static uintptr_t ozone_entries_icon_get_texture(ozone_handle_t *ozone,
case MENU_SETTING_ACTION_LOADSTATE:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LOADSTATE];
case MENU_SETTING_ACTION_CORE_OPTIONS:
if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS)))
if (string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_VIDEO];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS)))
else if (string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS)) ||
string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SOUND_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_AUDIO];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SETTINGS];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_OSD];
else if (string_is_equal(enum_path, "Media"))
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LATENCY_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TIMING_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_LATENCY];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PERFORMANCE_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_FRAMESKIP];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MEDIA_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STORAGE_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_RDB];
else if (string_is_equal(enum_path, "System"))
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SPECS_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_DRIVERS];
else
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS];
else if (strstr(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MAPPING_SETTINGS)))
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_OVERRIDE];
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_CORE_OPTIONS];
case MENU_SETTING_ACTION_CORE_OPTION_OVERRIDE_LIST:
case MENU_SETTING_ACTION_REMAP_FILE_MANAGER_LIST:
return ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_SETTING];

18
menu/drivers/xmb.c
View File

@ -3116,18 +3116,28 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
case MENU_SETTING_ACTION_LOADSTATE:
return xmb->textures.list[XMB_TEXTURE_LOADSTATE];
case MENU_SETTING_ACTION_CORE_OPTIONS:
if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS)))
if (string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_VIDEO_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_VIDEO];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS)))
else if (string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_AUDIO_SETTINGS)) ||
string_starts_with(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SOUND_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_AUDIO];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_INPUT_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_INPUT_SETTINGS];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_ONSCREEN_DISPLAY_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_OSD];
else if (string_is_equal(enum_path, "Media"))
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_LATENCY_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_TIMING_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_LATENCY];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_PERFORMANCE_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_FRAMESKIP];
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MEDIA_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STORAGE_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_RDB];
else if (string_is_equal(enum_path, "System"))
else if (string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SYSTEM_SETTINGS)) ||
string_is_equal(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_SPECS_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_DRIVERS];
else if (strstr(enum_path, msg_hash_to_str(MENU_ENUM_LABEL_VALUE_MAPPING_SETTINGS)))
return xmb->textures.list[XMB_TEXTURE_OVERRIDE];
return xmb->textures.list[XMB_TEXTURE_CORE_OPTIONS];
case MENU_SETTING_ACTION_CORE_INPUT_REMAPPING_OPTIONS:
return xmb->textures.list[XMB_TEXTURE_INPUT_REMAPPING_OPTIONS];

10
msg_hash.h
View File

@ -2594,6 +2594,16 @@ enum msg_hash_enums
MENU_LABEL(CHEAT_DETAILS_SETTINGS),
MENU_LABEL(CHEAT_SEARCH_SETTINGS),
/* Core option category placeholders for icons */
MENU_LABEL(MAPPING_SETTINGS),
MENU_LABEL(MEDIA_SETTINGS),
MENU_LABEL(PERFORMANCE_SETTINGS),
MENU_LABEL(SOUND_SETTINGS),
MENU_LABEL(SPECS_SETTINGS),
MENU_LABEL(STORAGE_SETTINGS),
MENU_LABEL(SYSTEM_SETTINGS),
MENU_LABEL(TIMING_SETTINGS),
MENU_ENUM_LABEL_ONSCREEN_KEYBOARD_OVERLAY_SETTINGS,
MENU_LABEL(MULTIMEDIA_SETTINGS),