ShuriZma
/
RetroArch
mirror of https://github.com/libretro/RetroArch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

(MaterialUI) Don't iteratively call menu_entries_get_size

This commit is contained in:
twinaphex 2020-06-07 17:58:55 +02:00
parent 4feed0031e
commit 26133d8336
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
menu/drivers/materialui.c
View File

@ -2356,11 +2356,12 @@ static void materialui_compute_entries_box_default(
(int)(mui->margin * 2) - (int)(mui->margin * 2) -
(int)(mui->landscape_optimization.entry_margin * 2); (int)(mui->landscape_optimization.entry_margin * 2);
float sum = 0; float sum = 0;
size_t entries_end = menu_entries_get_size();
if (!list) if (!list)
return; return;
for (i = 0; i < menu_entries_get_size(); i++) for (i = 0; i < entries_end; i++)
{ {
unsigned num_sublabel_lines = 0; unsigned num_sublabel_lines = 0;
materialui_node_t *node = (materialui_node_t*) materialui_node_t *node = (materialui_node_t*)
@ -2412,6 +2413,7 @@ static void materialui_compute_entries_box_playlist_list(
float node_x = (float)mui->landscape_optimization.border_width; float node_x = (float)mui->landscape_optimization.border_width;
int usable_width = node_entry_width - (int)(mui->margin * 2); int usable_width = node_entry_width - (int)(mui->margin * 2);
float sum = 0; float sum = 0;
size_t entries_end = menu_entries_get_size();
if (!list) if (!list)
return; return;
@ -2443,7 +2445,7 @@ static void materialui_compute_entries_box_playlist_list(
usable_width -= mui->thumbnail_width_max + thumbnail_margin; usable_width -= mui->thumbnail_width_max + thumbnail_margin;
} }
for (i = 0; i < menu_entries_get_size(); i++) for (i = 0; i < entries_end; i++)
{ {
unsigned num_sublabel_lines = 0; unsigned num_sublabel_lines = 0;
materialui_node_t *node = (materialui_node_t*) materialui_node_t *node = (materialui_node_t*)
@ -2503,11 +2505,12 @@ static void materialui_compute_entries_box_playlist_dual_icon(
(float)mui->thumbnail_height_max + (float)mui->thumbnail_height_max +
((float)mui->dip_base_unit_size / 5.0f); ((float)mui->dip_base_unit_size / 5.0f);
float sum = 0; float sum = 0;
size_t entries_end = menu_entries_get_size();
if (!list) if (!list)
return; return;
for (i = 0; i < menu_entries_get_size(); i++) for (i = 0; i < entries_end; i++)
{ {
materialui_node_t *node = (materialui_node_t*) materialui_node_t *node = (materialui_node_t*)
file_list_get_userdata_at_offset(list, i); file_list_get_userdata_at_offset(list, i);
@ -2569,11 +2572,12 @@ static void materialui_compute_entries_box_playlist_desktop(
float node_entry_height = node_text_height + float node_entry_height = node_text_height +
((float)mui->dip_base_unit_size / 7.0f); ((float)mui->dip_base_unit_size / 7.0f);
float sum = 0; float sum = 0;
size_t entries_end = menu_entries_get_size();
if (!list) if (!list)
return; return;
for (i = 0; i < menu_entries_get_size(); i++) for (i = 0; i < entries_end; i++)
{ {
materialui_node_t *node = (materialui_node_t*) materialui_node_t *node = (materialui_node_t*)
file_list_get_userdata_at_offset(list, i); file_list_get_userdata_at_offset(list, i);
@ -8801,12 +8805,12 @@ static int materialui_pointer_up(void *userdata,
menu_file_list_cbs_t *cbs, menu_file_list_cbs_t *cbs,
menu_entry_t *entry, unsigned action) menu_entry_t *entry, unsigned action)
{ {
unsigned width;
unsigned height;
unsigned header_height = gfx_display_get_header_height(); unsigned header_height = gfx_display_get_header_height();
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
size_t entries_end = menu_entries_get_size(); size_t entries_end = menu_entries_get_size();
materialui_handle_t *mui = (materialui_handle_t*)userdata; materialui_handle_t *mui = (materialui_handle_t*)userdata;
unsigned width;
unsigned height;
if (!mui) if (!mui)
return -1; return -1;