RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix-beatmap-listing' into fix-beatmap-listing-2

This commit is contained in:
Salman Ahmed 2021-01-26 09:43:49 +03:00
parent c317d60169 ca0242debe
commit 93bb2611d6
1 changed files with 14 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -183,25 +183,27 @@ private void addContentToPlaceholder(Drawable content)
if (lastContent != null) if (lastContent != null)
{ {
lastContent.FadeOut(100, Easing.OutQuint); var transform = lastContent.FadeOut(100, Easing.OutQuint);
// Consider the case when the new content is smaller than the last content. if (lastContent == notFoundContent)
// If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
// At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
// To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() =>
{ {
panelTarget.Remove(lastContent); // not found display may be used multiple times, so don't expire/dispose it.
transform.Schedule(() => panelTarget.Remove(lastContent));
// the content may be reused again (e.g. notFoundContent), clear Y-axis bypass for displaying back properly. }
lastContent.BypassAutoSizeAxes = Axes.None; else
}); {
// Consider the case when the new content is smaller than the last content.
// If the auto-size computation is delayed until fade out completes, the background remain high for too long making the resulting transition to the smaller height look weird.
// At the same time, if the last content's height is bypassed immediately, there is a period where the new content is at Alpha = 0 when the auto-sized height will be 0.
// To resolve both of these issues, the bypass is delayed until a point when the content transitions (fade-in and fade-out) overlap and it looks good to do so.
lastContent.Delay(25).Schedule(() => lastContent.BypassAutoSizeAxes = Axes.Y).Then().Schedule(() => lastContent.Expire());
}
} }
if (!content.IsAlive) if (!content.IsAlive)
panelTarget.Add(content); panelTarget.Add(content);
content.FadeInFromZero(200, Easing.OutQuint);
content.FadeInFromZero(200, Easing.OutQuint);
currentContent = content; currentContent = content;
} }