(XMB+Ozone) Fix search terms in title header (#14883)

This commit is contained in:
sonninnos 2023-01-21 18:16:25 +02:00 committed by GitHub
parent 1060fcc913
commit becf623bf0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 15 deletions

View File

@ -11240,6 +11240,9 @@ static void ozone_populate_entries(
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
ozone_selection_changed(ozone, false); ozone_selection_changed(ozone, false);
/* Refresh title for search terms */
ozone_set_header(ozone);
/* Handle playlist searches /* Handle playlist searches
* (Ozone is a fickle beast...) */ * (Ozone is a fickle beast...) */
if (ozone->flags & OZONE_FLAG_IS_PLAYLIST) if (ozone->flags & OZONE_FLAG_IS_PLAYLIST)
@ -11285,12 +11288,6 @@ static void ozone_populate_entries(
ozone->num_search_terms_old = num_search_terms; ozone->num_search_terms_old = num_search_terms;
} }
} }
else if (ozone->flags & OZONE_FLAG_IS_EXPLORE_LIST)
{
/* when refreshing the explore view, also refresh the title */
ozone_set_header(ozone);
}
return; return;
} }

View File

@ -2007,19 +2007,22 @@ static void xmb_set_title(xmb_handle_t *xmb)
if (!path) if (!path)
return; return;
/* Set alternative title when available */ /* Use real title for dynamic backgrounds */
if (node && node->console_name)
strlcpy(xmb->title_name_alt,
node->console_name,
sizeof(xmb->title_name_alt));
fill_pathname_base( fill_pathname_base(
xmb->title_name, path, sizeof(xmb->title_name)); xmb->title_name, path, sizeof(xmb->title_name));
path_remove_extension(xmb->title_name); path_remove_extension(xmb->title_name);
/* Add current search terms */ /* Set alternative title for visible header */
if (node && node->console_name)
{
strlcpy(xmb->title_name_alt,
node->console_name,
sizeof(xmb->title_name_alt));
/* Add current search terms to alternative title */
menu_entries_search_append_terms_string( menu_entries_search_append_terms_string(
xmb->title_name, sizeof(xmb->title_name)); xmb->title_name_alt, sizeof(xmb->title_name_alt));
}
} }
} }
@ -2756,6 +2759,9 @@ static void xmb_populate_entries(void *data,
{ {
xmb_selection_pointer_changed(xmb, false); xmb_selection_pointer_changed(xmb, false);
menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL); menu_driver_ctl(RARCH_MENU_CTL_UNSET_PREVENT_POPULATE, NULL);
/* Refresh title for search terms */
xmb_set_title(xmb);
return; return;
} }