mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-02-28 12:40:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

ozone: fix some values display

Browse Source
This commit is contained in:
natinusala 2018-11-13 14:08:28 +01:00
parent 8a1afb0a52
commit 2c628860c8
1 changed files with 25 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
menu/drivers/ozone.c
View File

@ -2750,19 +2750,16 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone,
char *value, char *value,
unsigned x, unsigned y, unsigned x, unsigned y,
uint32_t alpha_uint32, uint32_t alpha_uint32,
bool checked) menu_entry_t *entry)
{ {
enum msg_file_type hash_type;
bool switch_is_on = true; bool switch_is_on = true;
bool do_draw_text = false; bool do_draw_text = false;
if (!checked && string_is_empty(value)) if (!entry->checked && string_is_empty(value))
return; return;
hash_type = msg_hash_to_file_type(msg_hash_calculate(value));
/* check icon */ /* check icon */
if (checked) if (entry->checked)
{ {
menu_display_blend_begin(video_info); menu_display_blend_begin(video_info);
ozone_draw_icon(video_info, 30, 30, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 20, y - 22, video_info->width, video_info->height, 0, 1, ozone->theme_dynamic.entries_checkmark); ozone_draw_icon(video_info, 30, 30, ozone->theme->textures[OZONE_THEME_TEXTURE_CHECK], x - 20, y - 22, video_info->width, video_info->height, 0, 1, ozone->theme_dynamic.entries_checkmark);
@ -2785,25 +2782,31 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone,
} }
else else
{ {
switch (hash_type) if (!string_is_empty(entry->value))
{ {
case FILE_TYPE_IN_CARCHIVE: if (
case FILE_TYPE_COMPRESSED: string_is_equal(entry->value, "...") ||
case FILE_TYPE_MORE: string_is_equal(entry->value, "(PRESET)") ||
case FILE_TYPE_CORE: string_is_equal(entry->value, "(SHADER)") ||
case FILE_TYPE_DIRECT_LOAD: string_is_equal(entry->value, "(COMP)") ||
case FILE_TYPE_RDB: string_is_equal(entry->value, "(CORE)") ||
case FILE_TYPE_CURSOR: string_is_equal(entry->value, "(MOVIE)") ||
case FILE_TYPE_PLAIN: string_is_equal(entry->value, "(MUSIC)") ||
case FILE_TYPE_DIRECTORY: string_is_equal(entry->value, "(DIR)") ||
case FILE_TYPE_MUSIC: string_is_equal(entry->value, "(RDB)") ||
case FILE_TYPE_IMAGE: string_is_equal(entry->value, "(CURSOR)")||
case FILE_TYPE_MOVIE: string_is_equal(entry->value, "(CFILE)") ||
string_is_equal(entry->value, "(FILE)") ||
string_is_equal(entry->value, "(IMAGE)")
)
{
return; return;
default: }
else
do_draw_text = true; do_draw_text = true;
break;
} }
else
do_draw_text = true;
} }
if (do_draw_text) if (do_draw_text)
@ -2983,7 +2986,7 @@ border_iterate:
ticker.len = (entry_width - 60 - ((int)utf8len(entry_rich_label) * ozone->entry_font_glyph_width)) / ozone->entry_font_glyph_width; ticker.len = (entry_width - 60 - ((int)utf8len(entry_rich_label) * ozone->entry_font_glyph_width)) / ozone->entry_font_glyph_width;
menu_animation_ticker(&ticker); menu_animation_ticker(&ticker);
ozone_draw_entry_value(ozone, video_info, entry_value_ticker, x_offset + 426 + entry_width, y + FONT_SIZE_ENTRIES_LABEL + 8 - 1 + scroll_y,alpha_uint32, entry.checked); ozone_draw_entry_value(ozone, video_info, entry_value_ticker, x_offset + 426 + entry_width, y + FONT_SIZE_ENTRIES_LABEL + 8 - 1 + scroll_y,alpha_uint32, &entry);
free(entry_rich_label); free(entry_rich_label);
free(sublabel_str); free(sublabel_str);