mirror of
https://github.com/libretro/RetroArch
synced 2025-02-28 03:39:59 +00:00
This reverts commit f7f700318a875f352fa6bcba7ff56b62b3f1be2c.
This commit is contained in:
parent
27ee23cfd8
commit
d2e3dd136c
@ -490,9 +490,7 @@ struct ozone_handle
|
||||
ozone_footer_label_t cycle;
|
||||
ozone_footer_label_t search;
|
||||
ozone_footer_label_t fullscreen_thumbs;
|
||||
ozone_footer_label_t reset_to_default;
|
||||
ozone_footer_label_t metadata_toggle;
|
||||
ozone_footer_label_t help;
|
||||
} footer_labels;
|
||||
|
||||
struct
|
||||
@ -8629,10 +8627,6 @@ static void ozone_cache_footer_labels(ozone_handle_t *ozone)
|
||||
&ozone->footer_labels.search,
|
||||
MENU_ENUM_LABEL_VALUE_SEARCH);
|
||||
|
||||
ozone_cache_footer_label(ozone,
|
||||
&ozone->footer_labels.reset_to_default,
|
||||
MENU_ENUM_LABEL_VALUE_RESET_TO_DEFAULT_CONFIG);
|
||||
|
||||
ozone_cache_footer_label(ozone,
|
||||
&ozone->footer_labels.cycle,
|
||||
MENU_ENUM_LABEL_VALUE_CYCLE_THUMBNAILS);
|
||||
@ -8645,10 +8639,6 @@ static void ozone_cache_footer_labels(ozone_handle_t *ozone)
|
||||
&ozone->footer_labels.metadata_toggle,
|
||||
MSG_TOGGLE_CONTENT_METADATA);
|
||||
|
||||
ozone_cache_footer_label(ozone,
|
||||
&ozone->footer_labels.help,
|
||||
MENU_ENUM_LABEL_VALUE_HELP);
|
||||
|
||||
/* Record current language setting */
|
||||
ozone->footer_labels_language = *msg_hash_get_uint(MSG_HASH_USER_LANGUAGE);
|
||||
}
|
||||
@ -10181,11 +10171,6 @@ static void ozone_draw_footer(
|
||||
fullscreen_thumbnails_available &&
|
||||
!((ozone->is_quick_menu && menu_is_running_quick_menu())
|
||||
|| (ozone->flags & OZONE_FLAG_IS_STATE_SLOT));
|
||||
bool reset_to_default_available =
|
||||
!fullscreen_thumbnails_available &&
|
||||
ozone_is_current_entry_settings(menu_navigation_get_selection());
|
||||
bool help_available = !metadata_override_available;
|
||||
|
||||
|
||||
/* Determine x origin positions of each
|
||||
* button
|
||||
@ -10194,9 +10179,7 @@ static void ozone_draw_footer(
|
||||
* - back
|
||||
* - search
|
||||
* - toggle fullscreen thumbs (playlists only)
|
||||
* - reset to default (non-playlist only)
|
||||
* - toggle metadata (playlists only)
|
||||
* - help (non-playlist only) */
|
||||
* - toggle metadata (playlists only) */
|
||||
float ok_x = (float)video_width
|
||||
- footer_margin - ozone->footer_labels.ok.width - icon_size - icon_padding;
|
||||
float back_x = ok_x
|
||||
@ -10207,11 +10190,6 @@ static void ozone_draw_footer(
|
||||
float cycle_x = (thumbnail_cycle_enabled)
|
||||
? search_x - ozone->footer_labels.cycle.width - icon_size - (2.0f * icon_padding)
|
||||
: search_x;
|
||||
float reset_to_default_x = (reset_to_default_available)
|
||||
? search_x - ozone->footer_labels.reset_to_default.width - icon_size - (2.0f * icon_padding)
|
||||
: search_x;
|
||||
float help_x = reset_to_default_x
|
||||
- ozone->footer_labels.help.width - icon_size - (2.0f * icon_padding);
|
||||
float fullscreen_thumbs_x = cycle_x
|
||||
- ozone->footer_labels.fullscreen_thumbs.width - icon_size - (2.0f * icon_padding);
|
||||
float metadata_toggle_x = fullscreen_thumbs_x
|
||||
@ -10363,44 +10341,6 @@ static void ozone_draw_footer(
|
||||
1.0f,
|
||||
col,
|
||||
mymat);
|
||||
|
||||
/* > Reset to default */
|
||||
if (reset_to_default_available)
|
||||
ozone_draw_icon(
|
||||
p_disp,
|
||||
userdata,
|
||||
video_width,
|
||||
video_height,
|
||||
icon_size,
|
||||
icon_size,
|
||||
ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_START],
|
||||
reset_to_default_x,
|
||||
icon_y,
|
||||
video_width,
|
||||
video_height,
|
||||
0.0f,
|
||||
1.0f,
|
||||
col,
|
||||
mymat);
|
||||
|
||||
/* > Help */
|
||||
if (help_available)
|
||||
ozone_draw_icon(
|
||||
p_disp,
|
||||
userdata,
|
||||
video_width,
|
||||
video_height,
|
||||
icon_size,
|
||||
icon_size,
|
||||
ozone->icons_textures[OZONE_ENTRIES_ICONS_TEXTURE_INPUT_SELECT],
|
||||
help_x,
|
||||
icon_y,
|
||||
video_width,
|
||||
video_height,
|
||||
0.0f,
|
||||
1.0f,
|
||||
col,
|
||||
mymat);
|
||||
}
|
||||
|
||||
if (dispctx->blend_end)
|
||||
@ -10503,38 +10443,6 @@ static void ozone_draw_footer(
|
||||
1.0f,
|
||||
false);
|
||||
|
||||
/* > Reset to default */
|
||||
if (reset_to_default_available)
|
||||
gfx_display_draw_text(
|
||||
ozone->fonts.footer.font,
|
||||
ozone->footer_labels.reset_to_default.str,
|
||||
reset_to_default_x + icon_size + icon_padding,
|
||||
footer_text_y,
|
||||
video_width,
|
||||
video_height,
|
||||
ozone->theme->text_rgba,
|
||||
TEXT_ALIGN_LEFT,
|
||||
1.0f,
|
||||
false,
|
||||
1.0f,
|
||||
false);
|
||||
|
||||
/* > Help */
|
||||
if (help_available)
|
||||
gfx_display_draw_text(
|
||||
ozone->fonts.footer.font,
|
||||
ozone->footer_labels.help.str,
|
||||
help_x + icon_size + icon_padding,
|
||||
footer_text_y,
|
||||
video_width,
|
||||
video_height,
|
||||
ozone->theme->text_rgba,
|
||||
TEXT_ALIGN_LEFT,
|
||||
1.0f,
|
||||
false,
|
||||
1.0f,
|
||||
false);
|
||||
|
||||
/* Core title or Switch icon */
|
||||
if (menu_core_enable)
|
||||
{
|
||||
|
Loading…
x
Reference in New Issue
Block a user