mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-03-29 22:20:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

(menu widgets) Some more cleanups

Browse Source
This commit is contained in:
twinaphex 2019-02-07 08:23:34 +01:00
parent affd507151
commit c808c80e4a
4 changed files with 19 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
menu/drivers/ozone/ozone.c
View File

@ -52,7 +52,7 @@
#include "../../../tasks/tasks_internal.h"
#include "../../../dynamic.h"
ozone_node_t *ozone_alloc_node()
ozone_node_t *ozone_alloc_node(void)
{
ozone_node_t *node = (ozone_node_t*)malloc(sizeof(*node));

2
menu/drivers/ozone/ozone.h
View File

@ -199,7 +199,7 @@ void ozone_context_destroy_horizontal_list(ozone_handle_t *ozone);
void ozone_context_reset_horizontal_list(ozone_handle_t *ozone);
ozone_node_t *ozone_alloc_node();
ozone_node_t *ozone_alloc_node(void);
size_t ozone_list_get_size(void *data, enum menu_list_type type);

2
menu/drivers/ozone/ozone_theme.h
View File

@ -157,6 +157,6 @@ extern bool last_use_preferred_system_color_theme;
extern ozone_theme_t *ozone_default_theme;
void ozone_set_color_theme(ozone_handle_t *ozone, unsigned color_theme);
unsigned ozone_get_system_theme();
unsigned ozone_get_system_theme(void);
#endif

34
menu/widgets/menu_widgets.c
View File

@ -71,11 +71,11 @@ static uint64_t menu_widgets_frame_count = 0;
static menu_animation_ctx_tag generic_tag = (uintptr_t) &menu_widgets_inited;
/* Font data */
font_data_t *font_regular;
font_data_t *font_bold;
static font_data_t *font_regular;
static font_data_t *font_bold;
video_font_raster_block_t font_raster_regular;
video_font_raster_block_t font_raster_bold;
static video_font_raster_block_t font_raster_regular;
static video_font_raster_block_t font_raster_bold;
static float menu_widgets_pure_white[16] = {
1.00, 1.00, 1.00, 1.00,
@ -152,9 +152,9 @@ typedef struct menu_widget_msg
menu_timer_t hourglass_timer;
} menu_widget_msg_t;
static fifo_buffer_t *msg_queue;
static file_list_t *current_msgs;
static unsigned msg_queue_kill;
static fifo_buffer_t *msg_queue = NULL;
static file_list_t *current_msgs = NULL;
static unsigned msg_queue_kill = 0;
static unsigned msg_queue_tasks_count = 0; /* count of messages bound to a taskin current_msgs */
@ -166,7 +166,7 @@ static menu_texture_item msg_queue_icon_rect = 0;
static bool msg_queue_has_icons = false;
/* there can only be one message animation at a time to avoid confusing users */
static bool moving = false;
static bool widgets_moving = false;
/* Icons */
enum menu_widgets_icon
@ -476,7 +476,7 @@ static void menu_widgets_unfold_end(void *userdata)
menu_widget_msg_t *unfold = (menu_widget_msg_t*) userdata;
unfold->unfolding = false;
moving = false;
widgets_moving = false;
}
static void menu_widgets_move_end(void *userdata)
@ -501,9 +501,7 @@ static void menu_widgets_move_end(void *userdata)
unfold->unfolding = true;
}
else
{
moving = false;
}
widgets_moving = false;
}
static void menu_widgets_msg_queue_expired(void *userdata)
@ -552,7 +550,7 @@ static void menu_widgets_msg_queue_move(void)
menu_animation_push(&entry);
moving = true;
widgets_moving = true;
}
}
}
@ -587,7 +585,7 @@ static void menu_widgets_msg_queue_free(menu_widget_msg_t *msg, bool touch_list)
current_msgs->size--;
}
moving = false;
widgets_moving = false;
}
static void menu_widgets_msg_queue_kill_end(void *userdata)
@ -609,8 +607,8 @@ static void menu_widgets_msg_queue_kill(unsigned idx)
if (!msg)
return;
moving = true;
msg->dying = true;
widgets_moving = true;
msg->dying = true;
msg_queue_kill = idx;
@ -783,7 +781,7 @@ void menu_widgets_iterate(void)
#endif
/* Consume one message if available */
if (fifo_read_avail(msg_queue) > 0 && !moving && current_msgs->size < MSG_QUEUE_ONSCREEN_MAX)
if (fifo_read_avail(msg_queue) > 0 && !widgets_moving && current_msgs->size < MSG_QUEUE_ONSCREEN_MAX)
{
menu_widget_msg_t *msg_widget;
@ -849,7 +847,7 @@ void menu_widgets_iterate(void)
if (msg->task_ptr != NULL && (msg->task_finished || msg->task_cancelled))
menu_widgets_start_msg_expiration_timer(msg, TASK_FINISHED_DURATION);
if (msg->expired && !moving)
if (msg->expired && !widgets_moving)
{
menu_widgets_msg_queue_kill(i);
break;