libretro/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch.git synced 2024-11-22 23:49:50 +00:00
Code Issues Actions 23 Packages Projects Releases Wiki Activity

(Menu/MaterialUI/RGUI) Integrate more bool flags into flags

Browse Source
This commit is contained in:
libretroadmin 2024-09-08 17:53:39 +02:00
parent 0d6b249dbc
commit f4e2fbb660
2 changed files with 89 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

127
menu/drivers/materialui.c
View File

@ -414,8 +414,6 @@ typedef struct
float status_bar_shadow_opacity;
float selection_marker_shadow_opacity;
float screen_fade_opacity;
/* Flags */
bool divider_is_list_background;
} materialui_colors_t;
/* This structure holds auxiliary information for
@ -482,7 +480,6 @@ typedef struct
materialui_nav_bar_action_tab_t resume_tab; /* unsigned alignment */
materialui_nav_bar_menu_tab_t menu_tabs[MUI_NAV_BAR_NUM_MENU_TABS_MAX]; /* unsigned alignment */
enum materialui_nav_bar_location_type location;
bool menu_navigation_wrapped;
} materialui_nav_bar_t;
/* This structure holds all runtime parameters for
@ -493,8 +490,6 @@ typedef struct
int y;
unsigned width;
unsigned height;
bool active;
bool dragged;
} materialui_scrollbar_t;
/* This structure is used to cache system bar
@ -523,8 +518,6 @@ typedef struct
char str[MENU_SUBLABEL_MAX_LENGTH];
char runtime_fallback_str[255];
char last_played_fallback_str[255];
bool enabled;
bool cached;
} materialui_status_bar_t;
/* Contains the file path(s) and texture pointer
@ -565,7 +558,13 @@ enum materialui_handle_flags
MUI_FLAG_PRIMARY_THUMBNAIL_AVAILABLE = (1 << 15),
MUI_FLAG_SECONDARY_THUMBNAIL_ENABLED = (1 << 16),
MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS = (1 << 17),
MUI_FLAG_SHOW_SELECTION_MARKER_SHADOW = (1 << 18)
MUI_FLAG_SHOW_SELECTION_MARKER_SHADOW = (1 << 18),
MUI_FLAG_STATUSBAR_ENABLED = (1 << 19),
MUI_FLAG_STATUSBAR_CACHED = (1 << 20),
MUI_FLAG_SCROLLBAR_ACTIVE = (1 << 21),
MUI_FLAG_SCROLLBAR_DRAGGED = (1 << 22),
MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED = (1 << 23),
MUI_FLAG_COL_DIVIDER_IS_LIST_BG = (1 << 24)
};
typedef struct materialui_handle
@ -2027,7 +2026,8 @@ static void materialui_prepare_colors(
mui->colors.screensaver_tint = current_theme->screensaver_tint;
/* Flags */
mui->colors.divider_is_list_background = (current_theme->divider == current_theme->list_background);
if (current_theme->divider == current_theme->list_background)
mui->flags |= MUI_FLAG_COL_DIVIDER_IS_LIST_BG;
}
static const char *materialui_texture_path(unsigned id)
@ -2695,8 +2695,8 @@ static void materialui_scrollbar_init(
mui->scrollbar.height = 0;
mui->scrollbar.x = 0;
mui->scrollbar.y = 0;
mui->scrollbar.active = false;
mui->scrollbar.dragged = false;
mui->flags &= ~(MUI_FLAG_SCROLLBAR_ACTIVE
| MUI_FLAG_SCROLLBAR_DRAGGED);
/* If current window is too small to show any content
* (unlikely) or all entries currently fit on a single
@ -2706,7 +2706,7 @@ static void materialui_scrollbar_init(
return;
/* If we pass the above check, scrollbar is enabled */
mui->scrollbar.active = true;
mui->flags |= MUI_FLAG_SCROLLBAR_ACTIVE;
/* Get scrollbar height */
scrollbar_height = (int)((float)(view_height * view_height) / mui->content_height);
@ -3372,7 +3372,7 @@ static bool materialui_render_process_entry_playlist_desktop(
mui->desktop_thumbnail_last_selection = selection;
/* Fetch metadata for selected entry */
if (mui->status_bar.enabled)
if (mui->flags & MUI_FLAG_STATUSBAR_ENABLED)
{
uintptr_t alpha_tag = (uintptr_t)&mui->status_bar.alpha;
@ -3382,7 +3382,7 @@ static bool materialui_render_process_entry_playlist_desktop(
{
gfx_animation_kill_by_tag(&alpha_tag);
mui->status_bar.cached = false;
mui->flags &= ~MUI_FLAG_STATUSBAR_CACHED;
mui->status_bar.last_selected = selection;
mui->status_bar.delay_timer = 0.0f;
mui->status_bar.alpha = 0.0f;
@ -3390,7 +3390,7 @@ static bool materialui_render_process_entry_playlist_desktop(
}
/* Check whether metadata needs to be cached */
if (!mui->status_bar.cached)
if (!(mui->flags & MUI_FLAG_STATUSBAR_CACHED))
{
gfx_animation_t *p_anim = anim_get_ptr();
/* Check if delay timer has elapsed */
@ -3430,8 +3430,8 @@ static bool materialui_render_process_entry_playlist_desktop(
* string is NUL and set cached status
* to 'true' to avoid reading this
* broken playlist again... */
mui->status_bar.str[0] = '\0';
mui->status_bar.cached = true;
mui->status_bar.str[0] = '\0';
mui->flags |= MUI_FLAG_STATUSBAR_CACHED;
return true;
}
@ -3492,7 +3492,7 @@ static bool materialui_render_process_entry_playlist_desktop(
sizeof(mui->status_bar.str) - _len);
/* All metadata is cached */
mui->status_bar.cached = true;
mui->flags |= MUI_FLAG_STATUSBAR_CACHED;
/* Trigger fade in animation */
if (fade_duration > 0.0f)
@ -3692,7 +3692,7 @@ static void materialui_render(void *data,
/* If user is dragging the scrollbar, scroll
* location is determined by current pointer
* y position */
if (mui->scrollbar.dragged)
if (mui->flags & MUI_FLAG_SCROLLBAR_DRAGGED)
{
float view_height = (float)height - (float)header_height -
(float)mui->nav_bar_layout_height - (float)mui->status_bar.height;
@ -3776,7 +3776,7 @@ static void materialui_render(void *data,
if ( (first_entry_found)
&& (!last_entry_found)
&& (mui->pointer.type != MENU_POINTER_DISABLED)
&& (!(mui->scrollbar.dragged))
&& (!(mui->flags & MUI_FLAG_SCROLLBAR_DRAGGED))
&& (!(mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS)))
{
int16_t pointer_x = mui->pointer.x;
@ -4655,11 +4655,11 @@ static void materialui_render_menu_entry_playlist_list(
* the bottom edge of the list region,
* and when the divider color is different from
* the list background color */
draw_divider = (mui->list_view_type != MUI_LIST_VIEW_PLAYLIST) &&
!mui->colors.divider_is_list_background &&
(usable_width > 0) &&
((divider_y + (mui->entry_divider_width * 2)) <
(video_height - mui->nav_bar_layout_height - mui->status_bar.height));
draw_divider = (mui->list_view_type != MUI_LIST_VIEW_PLAYLIST)
&& (!(mui->flags & MUI_FLAG_COL_DIVIDER_IS_LIST_BG))
&& (usable_width > 0)
&& ((divider_y + (mui->entry_divider_width * 2)) <
(video_height - mui->nav_bar_layout_height - mui->status_bar.height));
if (draw_divider)
gfx_display_draw_quad(
@ -4704,10 +4704,10 @@ static void materialui_render_menu_entry_playlist_dual_icon(
* only draw a divider if its bottom edge is
* more than two times the divider thickness from
* the bottom edge of the list region */
bool draw_divider = (usable_width > 0) &&
!mui->colors.divider_is_list_background &&
((divider_y + (mui->entry_divider_width * 2)) <
(video_height - mui->nav_bar_layout_height - mui->status_bar.height));
bool draw_divider = (usable_width > 0)
&& (!(mui->flags & MUI_FLAG_COL_DIVIDER_IS_LIST_BG))
&& ((divider_y + (mui->entry_divider_width * 2)) <
(video_height - mui->nav_bar_layout_height - mui->status_bar.height));
gfx_display_t *p_disp = disp_get_ptr();
settings_t *settings = config_get_ptr();
@ -4877,9 +4877,9 @@ static void materialui_render_menu_entry_playlist_desktop(
* only draw a divider if its bottom edge is
* more than two times the divider thickness from
* the bottom edge of the list region */
bool draw_divider = (usable_width > 0) &&
!mui->colors.divider_is_list_background &&
((divider_y + (mui->entry_divider_width * 2)) <
bool draw_divider = (usable_width > 0)
&& (!(mui->flags & MUI_FLAG_COL_DIVIDER_IS_LIST_BG))
&& ((divider_y + (mui->entry_divider_width * 2)) <
(video_height - mui->nav_bar_layout_height - mui->status_bar.height));
/* Read entry parameters */
@ -5113,7 +5113,7 @@ static void materialui_render_selected_entry_aux_playlist_desktop(
}
/* Draw status bar */
if (mui->status_bar.enabled)
if (mui->flags & MUI_FLAG_STATUSBAR_ENABLED)
{
float status_bar_x = background_x;
float status_bar_y = (float)(video_height - mui->nav_bar_layout_height - mui->status_bar.height);
@ -5255,7 +5255,7 @@ static void materialui_render_menu_list(
size_t entries_end = list ? list->size : 0;
unsigned header_height = p_disp->header_height;
bool touch_feedback_enabled =
(!mui->scrollbar.dragged)
(!(mui->flags & MUI_FLAG_SCROLLBAR_DRAGGED))
&& (!(mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS))
&& (mui->touch_feedback_alpha >= 0.5f)
&& (mui->touch_feedback_selection == menu_input->ptr);
@ -5317,7 +5317,7 @@ static void materialui_render_menu_list(
list, selection);
/* Draw scrollbar */
if (mui->scrollbar.active)
if (mui->flags & MUI_FLAG_SCROLLBAR_ACTIVE)
gfx_display_draw_quad(
p_disp,
userdata,
@ -5582,10 +5582,10 @@ static void materialui_render_entry_touch_feedback(
/* Check whether pointer is currently
* held and stationary */
bool pointer_active =
( (!mui->scrollbar.dragged)
&& (!(mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS))
&& (mui->pointer.flags & MENU_INP_PTR_FLG_PRESSED)
&& (!(mui->pointer.flags & MENU_INP_PTR_FLG_DRAGGED)));
( (!(mui->flags & MUI_FLAG_SCROLLBAR_DRAGGED))
&& (!(mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS))
&& (mui->pointer.flags & MENU_INP_PTR_FLG_PRESSED)
&& (!(mui->pointer.flags & MENU_INP_PTR_FLG_DRAGGED)));
/* If pointer is held and stationary, need to check
* that current pointer selection is valid
@ -7163,7 +7163,7 @@ static void materialui_frame(void *data, video_frame_info_t *video_info)
* like this because we need to track its
* position in order to enable fast navigation
* via scrollbar 'dragging' */
if (mui->scrollbar.active)
if (mui->flags & MUI_FLAG_SCROLLBAR_ACTIVE)
materialui_update_scrollbar(mui, video_width, video_height,
header_height, list_x_offset);
materialui_render_menu_list(mui, p_disp,
@ -7533,12 +7533,12 @@ static void materialui_status_bar_init(
uintptr_t alpha_tag = (uintptr_t)&mui->status_bar.alpha;
/* Kill any existing fade in animation */
if ( (mui->status_bar.enabled)
if ( (mui->flags & MUI_FLAG_STATUSBAR_ENABLED)
|| (mui->status_bar.alpha > 0.0f))
gfx_animation_kill_by_tag(&alpha_tag);
/* Reset base parameters */
mui->status_bar.cached = false;
mui->flags &= ~MUI_FLAG_STATUSBAR_CACHED;
mui->status_bar.last_selected = 0;
mui->status_bar.delay_timer = 0.0f;
mui->status_bar.alpha = 0.0f;
@ -7548,11 +7548,13 @@ static void materialui_status_bar_init(
mui->status_bar.last_played_fallback_str[0] = '\0';
/* Determine enable state */
mui->status_bar.enabled =
(mui->list_view_type == MUI_LIST_VIEW_PLAYLIST_THUMB_DESKTOP) &&
playlist_show_sublabels;
if ( (mui->list_view_type == MUI_LIST_VIEW_PLAYLIST_THUMB_DESKTOP)
&& playlist_show_sublabels)
mui->flags |= MUI_FLAG_STATUSBAR_ENABLED;
else
mui->flags &= ~MUI_FLAG_STATUSBAR_ENABLED;
if (mui->status_bar.enabled)
if (mui->flags & MUI_FLAG_STATUSBAR_ENABLED)
{
size_t _len;
/* Determine status bar height */
@ -8112,8 +8114,8 @@ static void materialui_init_nav_bar(materialui_handle_t *mui)
mui->nav_bar.num_menu_tabs = 0;
mui->nav_bar.active_menu_tab_index = 0;
mui->nav_bar.last_active_menu_tab_index = 0;
mui->nav_bar.menu_navigation_wrapped = false;
mui->nav_bar.location = MUI_NAV_BAR_LOCATION_BOTTOM;
mui->flags &= ~MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED;
mui->nav_bar.location = MUI_NAV_BAR_LOCATION_BOTTOM;
}
static void materialui_menu_animation_update_time(
@ -8624,7 +8626,7 @@ static void materialui_init_transition_animation(
if ( mui->nav_bar.active_menu_tab_index
< mui->nav_bar.last_active_menu_tab_index)
{
if (mui->nav_bar.menu_navigation_wrapped)
if (mui->flags & MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED)
mui->transition_x_offset = 1.0f;
else
mui->transition_x_offset = -1.0f;
@ -8632,7 +8634,7 @@ static void materialui_init_transition_animation(
else if (mui->nav_bar.active_menu_tab_index
> mui->nav_bar.last_active_menu_tab_index)
{
if (mui->nav_bar.menu_navigation_wrapped)
if (mui->flags & MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED)
mui->transition_x_offset = -1.0f;
else
mui->transition_x_offset = 1.0f;
@ -9007,8 +9009,9 @@ static int materialui_switch_tabs(
/* Reset status parameters to default values
* > Saves checks later */
mui->nav_bar.menu_navigation_wrapped = false;
mui->flags &= ~MUI_FLAG_MENU_STACK_FLUSHED;
mui->flags &= ~(MUI_FLAG_MENU_STACK_FLUSHED
| MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED
);
/* If target tab is NULL, interpret menu action */
if (!target_tab)
@ -9023,8 +9026,8 @@ static int materialui_switch_tabs(
if (target_tab_index < 0)
{
target_tab_index = (int)mui->nav_bar.num_menu_tabs - 1;
mui->nav_bar.menu_navigation_wrapped = true;
target_tab_index = (int)mui->nav_bar.num_menu_tabs - 1;
mui->flags |= MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED;
}
}
break;
@ -9034,8 +9037,8 @@ static int materialui_switch_tabs(
if (target_tab_index >= (int)mui->nav_bar.num_menu_tabs)
{
target_tab_index = 0;
mui->nav_bar.menu_navigation_wrapped = true;
target_tab_index = 0;
mui->flags |= MUI_FLAG_NAVBAR_MENU_NAVIGATION_WRAPPED;
}
}
break;
@ -9800,17 +9803,17 @@ static int materialui_pointer_down(void *userdata,
* has no meaning when handling touch screen input... */
mui->touch_feedback_selection = 0;
mui->touch_feedback_alpha = 0.0f;
mui->flags |= MUI_FLAG_TOUCH_FEEDBACK_UPDATE_SELECTION;
mui->flags |= MUI_FLAG_TOUCH_FEEDBACK_UPDATE_SELECTION;
/* Enable scrollbar dragging, if required */
/* > Disable by default (saves checks later) */
mui->scrollbar.dragged = false;
mui->flags &= ~MUI_FLAG_SCROLLBAR_DRAGGED;
/* > Check if scrollbar is enabled
* (note: dragging is disabled when showing
* fullscreen thumbnails) */
if ( mui->scrollbar.active
if ( (mui->flags & MUI_FLAG_SCROLLBAR_ACTIVE)
&& (!(mui->flags & MUI_FLAG_SHOW_FULLSCREEN_THUMBNAILS)))
{
unsigned width;
@ -9873,7 +9876,7 @@ static int materialui_pointer_down(void *userdata,
materialui_kill_scroll_animation(mui, menu_st);
/* > Enable dragging */
mui->scrollbar.dragged = true;
mui->flags |= MUI_FLAG_SCROLLBAR_DRAGGED;
/* Increase thumbnail stream delay
* (prevents overloading the system with
@ -10054,7 +10057,7 @@ static int materialui_pointer_up(void *userdata,
/* All input is ignored if user was previously
* dragging the scrollbar */
if (mui->scrollbar.dragged)
if (mui->flags & MUI_FLAG_SCROLLBAR_DRAGGED)
{
/* Must reset scroll acceleration, otherwise
* list will continue to 'drift' in drag direction */
@ -10063,7 +10066,7 @@ static int materialui_pointer_up(void *userdata,
/* Reset thumbnail stream delay */
gfx_thumbnail_set_stream_delay(mui->thumbnail_stream_delay);
mui->scrollbar.dragged = false;
mui->flags &= ~MUI_FLAG_SCROLLBAR_DRAGGED;
return 0;
}

48
menu/drivers/rgui.c
View File

@ -273,7 +273,8 @@ enum rgui_flags
RGUI_FLAG_ENTRY_HAS_THUMBNAIL = (1 << 21),
RGUI_FLAG_ENTRY_HAS_LEFT_THUMBNAIL = (1 << 22),
RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL = (1 << 23),
RGUI_FLAG_IS_PLAYLISTS_TAB = (1 << 24)
RGUI_FLAG_IS_PLAYLISTS_TAB = (1 << 24),
RGUI_FLAG_IS_QUICK_MENU = (1 << 25)
};
typedef struct
@ -356,8 +357,6 @@ typedef struct
char last_theme_dynamic_path[PATH_MAX_LENGTH]; /* Must be a fixed length array... */
char menu_title[255]; /* Must be a fixed length array... */
char menu_sublabel[MENU_SUBLABEL_MAX_LENGTH]; /* Must be a fixed length array... */
bool is_quick_menu;
} rgui_t;
static const rgui_theme_t rgui_theme_classic_red = {
@ -4977,7 +4976,7 @@ static void rgui_render(
rgui_t *rgui = (rgui_t*)data;
enum gfx_animation_ticker_type
menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_ticker_type;
bool rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails || rgui->is_quick_menu;
bool rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails || (rgui->flags & RGUI_FLAG_IS_QUICK_MENU);
bool menu_battery_level_enable = settings->bools.menu_battery_level_enable;
bool use_smooth_ticker = settings->bools.menu_ticker_smooth;
bool rgui_swap_thumbnails = settings->bools.menu_rgui_swap_thumbnails;
@ -5210,7 +5209,7 @@ static void rgui_render(
size_t _len = strlcpy(thumbnail_title_buf,
msg_hash_to_str(MENU_ENUM_LABEL_VALUE_STATE_SLOT),
sizeof(thumbnail_title_buf));
if (rgui->is_quick_menu)
if (rgui->flags & RGUI_FLAG_IS_QUICK_MENU)
{
snprintf(thumbnail_title_buf + _len,
sizeof(thumbnail_title_buf) - _len,
@ -5290,12 +5289,12 @@ static void rgui_render(
&& rgui->playlist_index >= 0
&& ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| ((rgui->is_quick_menu) && !menu_is_running_quick_menu()));
|| ((rgui->flags & RGUI_FLAG_IS_QUICK_MENU) && !menu_is_running_quick_menu()));
bool show_thumbnail = false;
bool show_left_thumbnail = false;
bool show_savestate_thumbnail = (!string_is_empty(rgui->savestate_thumbnail_file_path)
&& ( (rgui->flags & RGUI_FLAG_IS_STATE_SLOT)
|| ((rgui->is_quick_menu) && menu_is_running_quick_menu())));
|| ((rgui->flags & RGUI_FLAG_IS_QUICK_MENU) && menu_is_running_quick_menu())));
unsigned thumbnail_panel_width = 0;
unsigned term_mid_point = 0;
size_t powerstate_len = 0;
@ -6873,7 +6872,7 @@ static void rgui_update_savestate_thumbnail_path(void *data, unsigned i)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!( (rgui->is_quick_menu && menu_is_running_quick_menu())
if (!( (rgui->flags & RGUI_FLAG_IS_QUICK_MENU && menu_is_running_quick_menu())
|| (rgui->flags & RGUI_FLAG_IS_STATE_SLOT)))
return;
@ -6985,7 +6984,7 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load)
/* Update thumbnail content/path */
if ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| (rgui->is_quick_menu))
|| (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
{
bool playlist_valid = false;
size_t playlist_index = selection;
@ -7006,7 +7005,7 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load)
gfx_thumbnail_set_content_playlist(menu_st->thumbnail_path_data,
playlist_valid ? playlist_get_cached() : NULL, playlist_index);
}
else if (rgui->is_quick_menu)
else if (rgui->flags & RGUI_FLAG_IS_QUICK_MENU)
{
if (string_is_empty(rgui->savestate_thumbnail_file_path))
playlist_valid = true;
@ -7123,7 +7122,7 @@ static void rgui_refresh_thumbnail_image(void *userdata, unsigned i)
if (!rgui || !settings)
return;
rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails
|| rgui->is_quick_menu;
|| (rgui->flags & RGUI_FLAG_IS_QUICK_MENU);
/* Only refresh thumbnails if thumbnails are enabled */
if ( ((rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) || rgui_inline_thumbnails)
@ -7151,7 +7150,7 @@ static void rgui_refresh_thumbnail_image(void *userdata, unsigned i)
* immediately, for an optimal user experience) */
if ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| (rgui->is_quick_menu))
|| (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
rgui_scan_selected_entry_thumbnail(rgui, true);
}
}
@ -7319,9 +7318,9 @@ static void rgui_populate_entries(
if ( string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_DEFERRED_RPL_ENTRY_ACTIONS))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_CONTENT_SETTINGS))
|| string_is_equal(label, msg_hash_to_str(MENU_ENUM_LABEL_SAVESTATE_LIST)))
rgui->is_quick_menu = true;
rgui->flags |= RGUI_FLAG_IS_QUICK_MENU;
else
rgui->is_quick_menu = false;
rgui->flags &= ~RGUI_FLAG_IS_QUICK_MENU;
if (string_to_unsigned(path) == MENU_ENUM_LABEL_STATE_SLOT)
rgui->flags |= RGUI_FLAG_IS_STATE_SLOT;
@ -7331,8 +7330,9 @@ static void rgui_populate_entries(
/* Quick Menu under Explore list must also be Quick Menu */
if (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
{
rgui->is_quick_menu |= menu_is_nonrunning_quick_menu() || menu_is_running_quick_menu();
if (rgui->is_quick_menu)
if (menu_is_nonrunning_quick_menu() || menu_is_running_quick_menu())
rgui->flags |= RGUI_FLAG_IS_QUICK_MENU;
if (rgui->flags & RGUI_FLAG_IS_QUICK_MENU)
rgui->flags &= ~RGUI_FLAG_IS_EXPLORE_LIST;
}
@ -7815,7 +7815,7 @@ static void rgui_toggle(void *userdata, bool menu_on)
/* Have to reset this, otherwise savestate
* thumbnail won't update after selecting
* 'save state' option */
if (rgui->is_quick_menu)
if (rgui->flags & RGUI_FLAG_IS_QUICK_MENU)
{
rgui_reset_savestate_thumbnail(rgui);
@ -7973,7 +7973,7 @@ static enum menu_action rgui_parse_menu_entry_action(
case MENU_ACTION_CANCEL:
if (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL)
{
if ( ((rgui->flags & RGUI_FLAG_IS_STATE_SLOT) || (rgui->is_quick_menu))
if ( ((rgui->flags & RGUI_FLAG_IS_STATE_SLOT) || (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
&& !string_is_empty(rgui->savestate_thumbnail_file_path))
{
rgui_toggle_fs_thumbnail(rgui, true);
@ -7999,7 +7999,7 @@ static enum menu_action rgui_parse_menu_entry_action(
/* Playlist thumbnail fullscreen toggle */
if ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| (rgui->is_quick_menu && !menu_is_running_quick_menu()))
|| ((rgui->flags & RGUI_FLAG_IS_QUICK_MENU) && !menu_is_running_quick_menu()))
{
settings_t *settings = config_get_ptr();
@ -8044,7 +8044,7 @@ static enum menu_action rgui_parse_menu_entry_action(
break;
case MENU_ACTION_SCAN:
/* Save state slot fullscreen toggle */
if ( ((rgui->flags & RGUI_FLAG_IS_STATE_SLOT) || (rgui->is_quick_menu))
if ( ((rgui->flags & RGUI_FLAG_IS_STATE_SLOT) || (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
&& !string_is_empty(rgui->savestate_thumbnail_file_path))
{
rgui_toggle_fs_thumbnail(rgui, true);
@ -8053,7 +8053,7 @@ static enum menu_action rgui_parse_menu_entry_action(
/* Playlist thumbnail cycle */
else if ((rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| (rgui->is_quick_menu))
|| (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
{
settings_t *settings = config_get_ptr();
@ -8123,13 +8123,13 @@ static enum menu_action rgui_parse_menu_entry_action(
case MENU_ACTION_SCROLL_UP:
case MENU_ACTION_SCROLL_DOWN:
if ( (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL)
&& (rgui->is_quick_menu))
&& (rgui->flags & RGUI_FLAG_IS_QUICK_MENU))
new_action = MENU_ACTION_NOOP;
break;
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
if ( (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL)
&& ((rgui->is_quick_menu) && !menu_is_running_quick_menu()))
if ( (rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL)
&& ((rgui->flags & RGUI_FLAG_IS_QUICK_MENU) && !menu_is_running_quick_menu()))
new_action = MENU_ACTION_NOOP;
break;
default: