mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-01 07:13:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7555 from natinusala/ozone

Browse Source 
ozone: never draw cogs
This commit is contained in:
Twinaphex 2018-11-07 13:40:45 +01:00 committed by GitHub
commit ffd709f823
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
menu/drivers/ozone.c
View File

@ -549,9 +549,6 @@ typedef struct ozone_handle
float scroll_old; float scroll_old;
bool want_horizontal_animation; bool want_horizontal_animation;
bool draw_icons;
bool draw_icons_old;
} ozone_handle_t; } ozone_handle_t;
/* If you change this struct, also /* If you change this struct, also
@ -2067,7 +2064,6 @@ static void ozone_compute_entries_position(ozone_handle_t *ozone)
/* Compute entries height and adjust scrolling if needed */ /* Compute entries height and adjust scrolling if needed */
unsigned video_info_height; unsigned video_info_height;
unsigned video_info_width; unsigned video_info_width;
unsigned icon;
size_t i, entries_end; size_t i, entries_end;
file_list_t *selection_buf = NULL; file_list_t *selection_buf = NULL;
@ -2079,7 +2075,6 @@ static void ozone_compute_entries_position(ozone_handle_t *ozone)
video_driver_get_size(&video_info_width, &video_info_height); video_driver_get_size(&video_info_width, &video_info_height);
ozone->entries_height = 0; ozone->entries_height = 0;
ozone->draw_icons = false;
for (i = 0; i < entries_end; i++) for (i = 0; i < entries_end; i++)
{ {
@ -2099,11 +2094,6 @@ static void ozone_compute_entries_position(ozone_handle_t *ozone)
node->height = (entry.sublabel ? 100 : 60-8); node->height = (entry.sublabel ? 100 : 60-8);
node->wrap = false; node->wrap = false;
icon = ozone_entries_icon_get_id(ozone, entry.enum_idx, entry.type, false);
if (icon != OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING)
ozone->draw_icons = true;
if (entry.sublabel) if (entry.sublabel)
{ {
char *sublabel_str = menu_entry_get_sublabel(&entry); char *sublabel_str = menu_entry_get_sublabel(&entry);
@ -2522,8 +2512,7 @@ static void ozone_draw_entry_value(ozone_handle_t *ozone,
static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info, static void ozone_draw_entries(ozone_handle_t *ozone, video_frame_info_t *video_info,
unsigned selection, unsigned selection_old, unsigned selection, unsigned selection_old,
file_list_t *selection_buf, float alpha, float scroll_y, file_list_t *selection_buf, float alpha, float scroll_y)
bool draw_icons)
{ {
bool old_list; bool old_list;
uint32_t alpha_uint32; uint32_t alpha_uint32;
@ -2635,10 +2624,9 @@ text_iterate:
goto icons_iterate; goto icons_iterate;
/* Icon */ /* Icon */
if (draw_icons) icon = ozone_entries_icon_get_id(ozone, entry.enum_idx, entry.type, entry_selected);
if (icon != OZONE_ENTRIES_ICONS_TEXTURE_SUBSETTING)
{ {
icon = ozone_entries_icon_get_id(ozone, entry.enum_idx, entry.type, entry_selected);
ozone_color_alpha(ozone->theme_dynamic.entries_icon, alpha); ozone_color_alpha(ozone->theme_dynamic.entries_icon, alpha);
menu_display_blend_begin(video_info); menu_display_blend_begin(video_info);
@ -2825,8 +2813,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
ozone->selection_old, ozone->selection_old,
menu_entries_get_selection_buf_ptr(0), menu_entries_get_selection_buf_ptr(0),
ozone->animations.list_alpha, ozone->animations.list_alpha,
ozone->animations.scroll_y, ozone->animations.scroll_y
ozone->draw_icons
); );
/* Old list */ /* Old list */
@ -2837,8 +2824,7 @@ static void ozone_frame(void *data, video_frame_info_t *video_info)
ozone->selection_old_list, ozone->selection_old_list,
ozone->selection_buf_old, ozone->selection_buf_old,
ozone->animations.list_alpha, ozone->animations.list_alpha,
ozone->scroll_old, ozone->scroll_old
ozone->draw_icons_old
); );
menu_display_scissor_end(video_info); menu_display_scissor_end(video_info);
@ -3364,7 +3350,6 @@ static void ozone_list_cache(void *data,
ozone->need_compute = true; ozone->need_compute = true;
ozone->selection_old_list = ozone->selection; ozone->selection_old_list = ozone->selection;
ozone->scroll_old = ozone->animations.scroll_y; ozone->scroll_old = ozone->animations.scroll_y;
ozone->draw_icons_old = ozone->draw_icons;
/* Deep copy visible elements */ /* Deep copy visible elements */
video_driver_get_size(NULL, &video_info_height); video_driver_get_size(NULL, &video_info_height);