h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 11:22:54 +08:00
Code Issues Releases Wiki Activity

Fix broken CarouselContainer animations

Browse Source 
The previous commit broke animations of difficulty panels when
selecting beatmaps. This commit fixes these.
This commit is contained in:
Thomas Müller 2017-03-04 09:32:39 +01:00
parent a97a7f1024
commit 9bddd1ed4b
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu-framework

@ -1 +1 @@
Subproject commit 798409058a421307b5a92aeea4cd60a065f5a0d4 Subproject commit 25e6193625fbffb4d6fde3f91d85eeb9f85c4504

6
osu.Game/Screens/Select/CarouselContainer.cs
View File

@ -47,11 +47,11 @@ namespace osu.Game.Screens.Select
groups.Add(group); groups.Add(group);
panels.Add(group.Header); panels.Add(group.Header);
group.Header.Clock = Clock; group.Header.UpdateClock(Clock);
foreach (BeatmapPanel panel in group.BeatmapPanels) foreach (BeatmapPanel panel in group.BeatmapPanels)
{ {
panels.Add(panel); panels.Add(panel);
panel.Clock = Clock; panel.UpdateClock(Clock);
} }
computeYPositions(); computeYPositions();
@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select
private void movePanel(Panel panel, bool advance, bool animated, ref float currentY) private void movePanel(Panel panel, bool advance, bool animated, ref float currentY)
{ {
yPositions.Add(currentY); yPositions.Add(currentY);
panel.MoveToY(currentY, animated && (panel.State != PanelSelectedState.Hidden) ? 750 : 0, EasingTypes.OutExpo); panel.MoveToY(currentY, animated ? 750 : 0, EasingTypes.OutExpo);
if (advance) if (advance)
currentY += panel.DrawHeight + 5; currentY += panel.DrawHeight + 5;