diff --git a/osu-framework b/osu-framework index 798409058a..25e6193625 160000 --- a/osu-framework +++ b/osu-framework @@ -1 +1 @@ -Subproject commit 798409058a421307b5a92aeea4cd60a065f5a0d4 +Subproject commit 25e6193625fbffb4d6fde3f91d85eeb9f85c4504 diff --git a/osu.Game/Screens/Select/CarouselContainer.cs b/osu.Game/Screens/Select/CarouselContainer.cs index cbf6e1f860..4c3914c1d2 100644 --- a/osu.Game/Screens/Select/CarouselContainer.cs +++ b/osu.Game/Screens/Select/CarouselContainer.cs @@ -47,11 +47,11 @@ namespace osu.Game.Screens.Select groups.Add(group); panels.Add(group.Header); - group.Header.Clock = Clock; + group.Header.UpdateClock(Clock); foreach (BeatmapPanel panel in group.BeatmapPanels) { panels.Add(panel); - panel.Clock = Clock; + panel.UpdateClock(Clock); } computeYPositions(); @@ -69,7 +69,7 @@ namespace osu.Game.Screens.Select private void movePanel(Panel panel, bool advance, bool animated, ref float 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) currentY += panel.DrawHeight + 5;