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

(RGUI) Fix and add toggle for playlist thumbnails

Browse Source
This commit is contained in:
sonninnos 2023-05-04 15:04:22 +03:00 committed by LibretroAdmin
parent 51a0d1086a
commit 19a417434a
2 changed files with 36 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
intl/msg_hash_us.h
View File

@ -10602,7 +10602,7 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_MENU_RGUI_INLINE_THUMBNAILS, MENU_ENUM_SUBLABEL_MENU_RGUI_INLINE_THUMBNAILS,
"Enable display of inline downscaled thumbnails while viewing playlists. When disabled, 'Top Thumbnail' may still be toggled fullscreen by pressing RetroPad Y." "Enable display of inline downscaled thumbnails while viewing playlists. Toggleable with RetroPad Select. When disabled, thumbnails can still be toggled fullscreen with RetroPad Start."
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_THUMBNAILS_RGUI, MENU_ENUM_LABEL_VALUE_THUMBNAILS_RGUI,
@ -10610,7 +10610,7 @@ MSG_HASH(
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_SUBLABEL_THUMBNAILS_RGUI, MENU_ENUM_SUBLABEL_THUMBNAILS_RGUI,
"Type of thumbnail to display at the top right of playlists. This thumbnail may be toggled fullscreen by pressing RetroPad Y." "Type of thumbnail to display at the top right of playlists. This thumbnail type can be cycled by pressing RetroPad Y."
) )
MSG_HASH( MSG_HASH(
MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_RGUI, MENU_ENUM_LABEL_VALUE_LEFT_THUMBNAILS_RGUI,

44
menu/drivers/rgui.c
View File

@ -2584,8 +2584,6 @@ static bool rgui_load_image(
{ {
struct texture_image *image = (struct texture_image*)data; struct texture_image *image = (struct texture_image*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool menu_rgui_inline_thumbnails =
settings->bools.menu_rgui_inline_thumbnails;
unsigned menu_rgui_thumbnail_downscaler = unsigned menu_rgui_thumbnail_downscaler =
settings->uints.menu_rgui_thumbnail_downscaler; settings->uints.menu_rgui_thumbnail_downscaler;
@ -2593,12 +2591,11 @@ static bool rgui_load_image(
rgui_process_thumbnail(rgui, &rgui->fs_thumbnail, &rgui->thumbnail_queue_size, rgui_process_thumbnail(rgui, &rgui->fs_thumbnail, &rgui->thumbnail_queue_size,
menu_rgui_thumbnail_downscaler, menu_rgui_thumbnail_downscaler,
image); image);
else if (menu_rgui_inline_thumbnails) else
rgui_process_thumbnail(rgui, &rgui->mini_thumbnail, &rgui->thumbnail_queue_size, rgui_process_thumbnail(rgui, &rgui->mini_thumbnail, &rgui->thumbnail_queue_size,
menu_rgui_thumbnail_downscaler, menu_rgui_thumbnail_downscaler,
image); image);
else
{
/* If user toggles settings rapidly on very slow systems, /* If user toggles settings rapidly on very slow systems,
* it is possible for a thumbnail to be requested without * it is possible for a thumbnail to be requested without
* it ever being processed. In this case, we still have to * it ever being processed. In this case, we still have to
@ -2607,16 +2604,11 @@ static bool rgui_load_image(
if (rgui->thumbnail_queue_size > 0) if (rgui->thumbnail_queue_size > 0)
rgui->thumbnail_queue_size--; rgui->thumbnail_queue_size--;
} }
}
break; break;
case MENU_IMAGE_LEFT_THUMBNAIL: case MENU_IMAGE_LEFT_THUMBNAIL:
{ {
struct texture_image *image = (struct texture_image*)data; struct texture_image *image = (struct texture_image*)data;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool menu_rgui_inline_thumbnails =
settings->bools.menu_rgui_inline_thumbnails;
bool savestate_thumbnail_enable =
settings->bools.savestate_thumbnail_enable;
unsigned menu_rgui_thumbnail_downscaler = unsigned menu_rgui_thumbnail_downscaler =
settings->uints.menu_rgui_thumbnail_downscaler; settings->uints.menu_rgui_thumbnail_downscaler;
@ -2626,18 +2618,16 @@ static bool rgui_load_image(
&rgui->left_thumbnail_queue_size, &rgui->left_thumbnail_queue_size,
menu_rgui_thumbnail_downscaler, menu_rgui_thumbnail_downscaler,
image); image);
else if (menu_rgui_inline_thumbnails || savestate_thumbnail_enable) else
rgui_process_thumbnail(rgui, rgui_process_thumbnail(rgui,
&rgui->mini_left_thumbnail, &rgui->mini_left_thumbnail,
&rgui->left_thumbnail_queue_size, &rgui->left_thumbnail_queue_size,
menu_rgui_thumbnail_downscaler, menu_rgui_thumbnail_downscaler,
image); image);
else
{
if (rgui->left_thumbnail_queue_size > 0) if (rgui->left_thumbnail_queue_size > 0)
rgui->left_thumbnail_queue_size--; rgui->left_thumbnail_queue_size--;
} }
}
break; break;
default: default:
break; break;
@ -4949,7 +4939,7 @@ static void rgui_render(
rgui_t *rgui = (rgui_t*)data; rgui_t *rgui = (rgui_t*)data;
enum gfx_animation_ticker_type enum gfx_animation_ticker_type
menu_ticker_type = (enum gfx_animation_ticker_type)settings->uints.menu_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; bool rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails || rgui->is_quick_menu;
bool menu_battery_level_enable = settings->bools.menu_battery_level_enable; bool menu_battery_level_enable = settings->bools.menu_battery_level_enable;
bool use_smooth_ticker = settings->bools.menu_ticker_smooth; bool use_smooth_ticker = settings->bools.menu_ticker_smooth;
bool rgui_swap_thumbnails = settings->bools.menu_rgui_swap_thumbnails; bool rgui_swap_thumbnails = settings->bools.menu_rgui_swap_thumbnails;
@ -6907,7 +6897,6 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load)
{ {
bool has_thumbnail = false; bool has_thumbnail = false;
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
bool menu_rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails;
unsigned menu_rgui_thumbnail_delay= settings->uints.menu_rgui_thumbnail_delay; unsigned menu_rgui_thumbnail_delay= settings->uints.menu_rgui_thumbnail_delay;
bool network_on_demand_thumbnails = settings->bools.network_on_demand_thumbnails; bool network_on_demand_thumbnails = settings->bools.network_on_demand_thumbnails;
rgui->flags &= ~(RGUI_FLAG_THUMBNAIL_LOAD_PENDING rgui->flags &= ~(RGUI_FLAG_THUMBNAIL_LOAD_PENDING
@ -6916,10 +6905,9 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load)
); );
/* Update thumbnail content/path */ /* Update thumbnail content/path */
if (((rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) || menu_rgui_inline_thumbnails) if ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
&& ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST) || (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST)
|| (rgui->is_quick_menu))) || (rgui->is_quick_menu))
{ {
size_t selection = menu_navigation_get_selection(); size_t selection = menu_navigation_get_selection();
size_t list_size = menu_entries_get_size(); size_t list_size = menu_entries_get_size();
@ -6975,7 +6963,7 @@ static void rgui_scan_selected_entry_thumbnail(rgui_t *rgui, bool force_load)
if (gfx_thumbnail_is_enabled(rgui->thumbnail_path_data, GFX_THUMBNAIL_RIGHT)) if (gfx_thumbnail_is_enabled(rgui->thumbnail_path_data, GFX_THUMBNAIL_RIGHT))
has_thumbnail = gfx_thumbnail_update_path(rgui->thumbnail_path_data, GFX_THUMBNAIL_RIGHT); has_thumbnail = gfx_thumbnail_update_path(rgui->thumbnail_path_data, GFX_THUMBNAIL_RIGHT);
if (menu_rgui_inline_thumbnails && gfx_thumbnail_is_enabled(rgui->thumbnail_path_data, GFX_THUMBNAIL_LEFT)) if (gfx_thumbnail_is_enabled(rgui->thumbnail_path_data, GFX_THUMBNAIL_LEFT))
has_thumbnail = gfx_thumbnail_update_path(rgui->thumbnail_path_data, GFX_THUMBNAIL_LEFT) || has_thumbnail; has_thumbnail = gfx_thumbnail_update_path(rgui->thumbnail_path_data, GFX_THUMBNAIL_LEFT) || has_thumbnail;
} }
@ -7065,7 +7053,8 @@ static void rgui_refresh_thumbnail_image(void *userdata, unsigned i)
bool rgui_inline_thumbnails = false; bool rgui_inline_thumbnails = false;
if (!rgui || !settings) if (!rgui || !settings)
return; return;
rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails; rgui_inline_thumbnails = settings->bools.menu_rgui_inline_thumbnails
|| rgui->is_quick_menu;
/* Only refresh thumbnails if thumbnails are enabled */ /* Only refresh thumbnails if thumbnails are enabled */
if ( ((rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) || rgui_inline_thumbnails) if ( ((rgui->flags & RGUI_FLAG_SHOW_FULLSCREEN_THUMBNAIL) || rgui_inline_thumbnails)
@ -7991,6 +7980,19 @@ static enum menu_action rgui_parse_menu_entry_action(
rgui_refresh_thumbnail_image(rgui, 0); rgui_refresh_thumbnail_image(rgui, 0);
} }
break; break;
case MENU_ACTION_INFO:
if ( (rgui->flags & RGUI_FLAG_IS_PLAYLIST)
|| (rgui->flags & RGUI_FLAG_IS_EXPLORE_LIST))
{
settings_t *settings = config_get_ptr();
configuration_set_uint(settings,
settings->bools.menu_rgui_inline_thumbnails,
!settings->bools.menu_rgui_inline_thumbnails);
rgui_refresh_thumbnail_image(rgui, 0);
new_action = MENU_ACTION_NOOP;
}
break;
case MENU_ACTION_UP: case MENU_ACTION_UP:
case MENU_ACTION_DOWN: case MENU_ACTION_DOWN:
case MENU_ACTION_SCROLL_UP: case MENU_ACTION_SCROLL_UP: