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

Merge pull request #12541 from sonninnos/xmb-dynamic

Browse Source 
(XMB) Dynamic wallpaper improvement
This commit is contained in:
Autechre 2021-06-20 16:54:49 +02:00 committed by GitHub
commit 2ae11b7222
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
menu/drivers/xmb.c
View File

@ -6339,10 +6339,24 @@ error:
static void xmb_context_reset_background(xmb_handle_t *xmb, const char *iconpath) static void xmb_context_reset_background(xmb_handle_t *xmb, const char *iconpath)
{ {
char path[PATH_MAX_LENGTH];
settings_t *settings = config_get_ptr(); settings_t *settings = config_get_ptr();
const char *path_menu_wp = settings->paths.path_menu_wallpaper; const char *path_menu_wp = settings->paths.path_menu_wallpaper;
if (!string_is_empty(path_menu_wp)) path[0] = '\0';
/* Dynamic wallpaper takes precedence as reset background,
* then comes 'menu_wallpaper', and then iconset 'bg.png' */
if (settings->bools.menu_dynamic_wallpaper_enable)
strlcpy(path, xmb_path_dynamic_wallpaper(xmb), sizeof(path));
if (!string_is_empty(path) && path_is_valid(path))
{
task_push_image_load(path,
video_driver_supports_rgba(), 0,
menu_display_handle_wallpaper_upload, NULL);
}
else if (!string_is_empty(path_menu_wp))
{ {
if (path_is_valid(path_menu_wp)) if (path_is_valid(path_menu_wp))
task_push_image_load(path_menu_wp, task_push_image_load(path_menu_wp,
@ -6351,16 +6365,8 @@ static void xmb_context_reset_background(xmb_handle_t *xmb, const char *iconpath
} }
else if (!string_is_empty(iconpath)) else if (!string_is_empty(iconpath))
{ {
char path[PATH_MAX_LENGTH]; fill_pathname_join(path, iconpath,
path[0] = '\0'; FILE_PATH_BACKGROUND_IMAGE, sizeof(path));
/* Use dynamic wallpaper background as fallback instead */
if (settings->bools.menu_dynamic_wallpaper_enable)
strlcpy(path, xmb_path_dynamic_wallpaper(xmb), sizeof(path));
if (!path_is_valid(path))
fill_pathname_join(path, iconpath,
FILE_PATH_BACKGROUND_IMAGE, sizeof(path));
if (path_is_valid(path)) if (path_is_valid(path))
task_push_image_load(path, task_push_image_load(path,