h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 17:02:55 +08:00
Code Issues Releases Wiki Activity

Force recreating sections container when loading new user to avoid weird UX when scrolled away

Browse Source
This commit is contained in:
Salman Ahmed 2024-07-14 15:19:26 +03:00
parent 43d08f702a
commit adb803c7a9
1 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
osu.Game/Overlays/UserProfileOverlay.cs
View File

@ -99,9 +99,8 @@ namespace osu.Game.Overlays
if (user.OnlineID == Header.User.Value?.User.Id && ruleset?.MatchesOnlineID(Header.User.Value?.Ruleset) == true)
return;
sectionsContainer?.ScrollToTop();
sectionsContainer?.Clear();
tabs?.Clear();
if (sectionsContainer != null)
sectionsContainer.ExpandableHeader = null;
userReq?.Cancel();
lastSection = null;
@ -119,7 +118,7 @@ namespace osu.Game.Overlays
}
: Array.Empty<ProfileSection>();
setupBaseContent(OverlayColourScheme.Pink);
setupBaseContent(OverlayColourScheme.Pink, forceContentRecreation: true);
if (API.State.Value != APIState.Offline)
{
@ -138,7 +137,7 @@ namespace osu.Game.Overlays
// reuse header and content if same colour scheme, otherwise recreate both.
var profileScheme = (OverlayColourScheme?)loadedUser.ProfileHue ?? OverlayColourScheme.Pink;
if (profileScheme != ColourProvider.ColourScheme)
setupBaseContent(profileScheme);
setupBaseContent(profileScheme, forceContentRecreation: false);
var actualRuleset = rulesets.GetRuleset(userRuleset?.ShortName ?? loadedUser.PlayMode).AsNonNull();
@ -164,17 +163,19 @@ namespace osu.Game.Overlays
loadingLayer.Hide();
}
private void setupBaseContent(OverlayColourScheme colourScheme)
private void setupBaseContent(OverlayColourScheme colourScheme, bool forceContentRecreation)
{
var previousColourScheme = ColourProvider.ColourScheme;
ColourProvider.ChangeColourScheme(colourScheme);
if (sectionsContainer != null && colourScheme == previousColourScheme)
if (colourScheme != previousColourScheme)
{
RecreateHeader();
UpdateColours();
}
else if (!forceContentRecreation)
return;
RecreateHeader();
UpdateColours();
Child = new OsuContextMenuContainer
{
RelativeSizeAxes = Axes.Both,