mirror/RetroArch
1
0
Fork 0
mirror of https://github.com/libretro/RetroArch synced 2025-04-10 06:44:27 +00:00
Code Issues Packages Projects Releases Wiki Activity

(Menu) Move duplicate code is_running_quickmenu to menu_driver.c

Browse Source
This commit is contained in:
LibretroAdmin 2022-08-24 13:28:53 +02:00
parent a147cb09d9
commit 2bc723bb4b
5 changed files with 33 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
menu/drivers/ozone.c
View File

@ -3359,27 +3359,13 @@ console_iterate:
video_width, video_height);
}
static bool ozone_is_running_quick_menu(void)
{
menu_entry_t entry;
MENU_ENTRY_INIT(entry);
entry.path_enabled = false;
entry.value_enabled = false;
entry.sublabel_enabled = false;
menu_entry_get(&entry, 0, 0, NULL, true);
return string_is_equal(entry.label, "resume_content") ||
string_is_equal(entry.label, "state_slot");
}
static void ozone_thumbnail_bar_hide_end(void *userdata)
{
ozone_handle_t *ozone = (ozone_handle_t*) userdata;
ozone->show_thumbnail_bar = false;
ozone->pending_hide_thumbnail_bar = false;
if (!(ozone->is_quick_menu && ozone_is_running_quick_menu()))
if (!(ozone->is_quick_menu && menu_is_running_quick_menu()))
ozone->need_compute = true;
}
@ -3425,7 +3411,7 @@ static void ozone_update_savestate_thumbnail_path(void *data, unsigned i)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!((ozone->is_quick_menu && ozone_is_running_quick_menu()) || ozone->is_state_slot))
if (!((ozone->is_quick_menu && menu_is_running_quick_menu()) || ozone->is_state_slot))
return;
if (savestate_thumbnail_enable)
@ -3514,7 +3500,7 @@ static void ozone_update_savestate_thumbnail_image(void *data)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!((ozone->is_quick_menu && ozone_is_running_quick_menu()) || ozone->is_state_slot))
if (!((ozone->is_quick_menu && menu_is_running_quick_menu()) || ozone->is_state_slot))
return;
/* If path is empty, just reset thumbnail */
@ -3812,7 +3798,7 @@ static void ozone_update_content_metadata(ozone_handle_t *ozone)
ozone->selection_core_is_viewer_real = ozone->selection_core_is_viewer;
if ((playlist && (ozone->is_playlist || (ozone->is_quick_menu && !ozone_is_running_quick_menu()))) ||
if ((playlist && (ozone->is_playlist || (ozone->is_quick_menu && !menu_is_running_quick_menu()))) ||
(ozone->is_db_manager_list && ozone->depth == 4))
{
const char *core_label = NULL;
@ -5356,7 +5342,7 @@ border_iterate:
sublabel_max_width -= (unsigned) ozone->dimensions_sidebar_width;
if (ozone->show_thumbnail_bar)
{
if (ozone->is_quick_menu && ozone_is_running_quick_menu())
if (ozone->is_quick_menu && menu_is_running_quick_menu())
sublabel_max_width -= ozone->dimensions.thumbnail_bar_width - entry_padding * 2;
else
sublabel_max_width -= ozone->dimensions.thumbnail_bar_width - entry_padding;
@ -7478,7 +7464,7 @@ static enum menu_action ozone_parse_menu_entry_action(
if (!menu_navigation_wraparound_enable && selection == 0 && !is_current_entry_settings)
ozone_start_cursor_wiggle(ozone, MENU_ACTION_DOWN);
if (ozone->show_fullscreen_thumbnails && (ozone->is_quick_menu && !ozone_is_running_quick_menu()))
if (ozone->show_fullscreen_thumbnails && (ozone->is_quick_menu && !menu_is_running_quick_menu()))
return MENU_ACTION_NOOP;
break;
@ -7509,7 +7495,7 @@ static enum menu_action ozone_parse_menu_entry_action(
ozone_start_cursor_wiggle(ozone, MENU_ACTION_DOWN);
if (ozone->show_fullscreen_thumbnails &&
(ozone->is_playlist || (ozone->is_quick_menu && !ozone_is_running_quick_menu())))
(ozone->is_playlist || (ozone->is_quick_menu && !menu_is_running_quick_menu())))
return MENU_ACTION_NOOP;
break;
@ -10764,7 +10750,7 @@ static void ozone_populate_entries(void *data,
}
else if (ozone->is_quick_menu)
{
if (ozone_is_running_quick_menu())
if (menu_is_running_quick_menu())
{
ozone->want_thumbnail_bar = false;
ozone->skip_thumbnail_reset = false;

26
menu/drivers/rgui.c
View File

@ -4753,20 +4753,6 @@ static bool rgui_set_aspect_ratio(rgui_t *rgui, gfx_display_t *p_disp,
bool delay_update);
#endif
static bool rgui_is_running_quick_menu(void)
{
menu_entry_t entry;
MENU_ENTRY_INIT(entry);
entry.path_enabled = false;
entry.value_enabled = false;
entry.sublabel_enabled = false;
menu_entry_get(&entry, 0, 0, NULL, true);
return string_is_equal(entry.label, "resume_content") ||
string_is_equal(entry.label, "state_slot");
}
static void rgui_render(void *data,
unsigned width, unsigned height,
bool is_idle)
@ -5102,11 +5088,11 @@ static void rgui_render(void *data,
((timedate_x - rgui->term_layout.start_x) / rgui->font_width_stride) - 3 :
rgui->term_layout.width - 1;
bool show_mini_thumbnails = rgui_inline_thumbnails &&
(rgui->is_playlist || (rgui->is_quick_menu && !rgui_is_running_quick_menu()));
(rgui->is_playlist || (rgui->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->is_state_slot || (rgui->is_quick_menu && rgui_is_running_quick_menu())));
(rgui->is_state_slot || (rgui->is_quick_menu && menu_is_running_quick_menu())));
unsigned thumbnail_panel_width = 0;
unsigned term_mid_point = 0;
size_t powerstate_len = 0;
@ -6559,7 +6545,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 && rgui_is_running_quick_menu()) || rgui->is_state_slot))
if (!((rgui->is_quick_menu && menu_is_running_quick_menu()) || rgui->is_state_slot))
return;
if (savestate_thumbnail_enable)
@ -6632,7 +6618,7 @@ static void rgui_update_savestate_thumbnail_image(void *data)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!((rgui->is_quick_menu && rgui_is_running_quick_menu()) || rgui->is_state_slot))
if (!((rgui->is_quick_menu && menu_is_running_quick_menu()) || rgui->is_state_slot))
return;
/* If path is empty, just reset thumbnail */
@ -7546,7 +7532,7 @@ static enum menu_action rgui_parse_menu_entry_action(
break;
case MENU_ACTION_START:
/* Playlist thumbnail fullscreen toggle */
if (rgui->is_playlist || (rgui->is_quick_menu && !rgui_is_running_quick_menu()))
if (rgui->is_playlist || (rgui->is_quick_menu && !menu_is_running_quick_menu()))
{
settings_t *settings = config_get_ptr();
@ -7651,7 +7637,7 @@ static enum menu_action rgui_parse_menu_entry_action(
break;
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
if (rgui->show_fs_thumbnail && (rgui->is_quick_menu && !rgui_is_running_quick_menu()))
if (rgui->show_fs_thumbnail && (rgui->is_quick_menu && !menu_is_running_quick_menu()))
new_action = MENU_ACTION_NOOP;
break;
default:

20
menu/drivers/xmb.c
View File

@ -1147,20 +1147,6 @@ static void xmb_update_dynamic_wallpaper(xmb_handle_t *xmb)
path = NULL;
}
static bool xmb_is_running_quick_menu(void)
{
menu_entry_t entry;
MENU_ENTRY_INIT(entry);
entry.path_enabled = false;
entry.value_enabled = false;
entry.sublabel_enabled = false;
menu_entry_get(&entry, 0, 0, NULL, true);
return string_is_equal(entry.label, "resume_content") ||
string_is_equal(entry.label, "state_slot");
}
static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
{
settings_t *settings = config_get_ptr();
@ -1184,7 +1170,7 @@ static void xmb_update_savestate_thumbnail_path(void *data, unsigned i)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!((xmb->is_quick_menu && xmb_is_running_quick_menu()) || xmb->is_state_slot))
if (!((xmb->is_quick_menu && menu_is_running_quick_menu()) || xmb->is_state_slot))
return;
xmb->fullscreen_thumbnails_available = false;
@ -1474,7 +1460,7 @@ static void xmb_update_savestate_thumbnail_image(void *data)
/* Savestate thumbnails are only relevant
* when viewing the running quick menu or state slots */
if (!((xmb->is_quick_menu && xmb_is_running_quick_menu()) || xmb->is_state_slot))
if (!((xmb->is_quick_menu && menu_is_running_quick_menu()) || xmb->is_state_slot))
return;
/* If path is empty, just reset thumbnail */
@ -4150,7 +4136,7 @@ static enum menu_action xmb_parse_menu_entry_action(
{
case MENU_ACTION_LEFT:
case MENU_ACTION_RIGHT:
if (xmb->show_fullscreen_thumbnails && (xmb->is_quick_menu && !xmb_is_running_quick_menu()))
if (xmb->show_fullscreen_thumbnails && (xmb->is_quick_menu && !menu_is_running_quick_menu()))
return MENU_ACTION_NOOP;
/* Check whether left/right action will

14
menu/menu_driver.c
View File

@ -8273,3 +8273,17 @@ size_t menu_update_fullscreen_thumbnail_label(
return strlcpy(s, thumbnail_label, len);
return 0;
}
bool menu_is_running_quick_menu(void)
{
menu_entry_t entry;
MENU_ENTRY_INIT(entry);
entry.path_enabled = false;
entry.value_enabled = false;
entry.sublabel_enabled = false;
menu_entry_get(&entry, 0, 0, NULL, true);
return string_is_equal(entry.label, "resume_content") ||
string_is_equal(entry.label, "state_slot");
}

2
menu/menu_driver.h
View File

@ -1008,6 +1008,8 @@ size_t menu_update_fullscreen_thumbnail_label(
char *s, size_t len,
bool is_quick_menu, size_t playlist_index);
bool menu_is_running_quick_menu(void);
extern const menu_ctx_driver_t *menu_ctx_drivers[];
RETRO_END_DECLS