From 0cd049c6b05d29b641e085a22101fdf34d37915d Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Sun, 25 Feb 2018 05:49:45 +0900
Subject: [PATCH 1/3] Rely less on zero-duration transform helpers

They have huge overheads.

See ppy/osu-framework#1411.
---
 osu.Game/Graphics/Containers/ParallaxContainer.cs | 6 ++++--
 osu.Game/Screens/Play/SongProgressBar.cs          | 2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/osu.Game/Graphics/Containers/ParallaxContainer.cs b/osu.Game/Graphics/Containers/ParallaxContainer.cs
index cb894ca382..8ab264da8e 100644
--- a/osu.Game/Graphics/Containers/ParallaxContainer.cs
+++ b/osu.Game/Graphics/Containers/ParallaxContainer.cs
@@ -8,6 +8,7 @@ using OpenTK;
 using osu.Framework.Allocation;
 using osu.Game.Configuration;
 using osu.Framework.Configuration;
+using osu.Framework.MathUtils;
 
 namespace osu.Game.Graphics.Containers
 {
@@ -61,8 +62,9 @@ namespace osu.Game.Graphics.Containers
 
             if (parallaxEnabled)
             {
-                Vector2 offset = input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2;
-                content.MoveTo(offset * ParallaxAmount, firstUpdate ? 0 : 1000, Easing.OutQuint);
+                Vector2 offset = (input.CurrentState.Mouse == null ? Vector2.Zero : ToLocalSpace(input.CurrentState.Mouse.NativeState.Position) - DrawSize / 2) * ParallaxAmount;
+
+                content.Position = Interpolation.ValueAt(Clock.ElapsedFrameTime, content.Position, offset, 0, 1000, Easing.OutQuint);
                 content.Scale = new Vector2(1 + ParallaxAmount);
             }
 
diff --git a/osu.Game/Screens/Play/SongProgressBar.cs b/osu.Game/Screens/Play/SongProgressBar.cs
index ffe7ae04f8..4f5cc79b53 100644
--- a/osu.Game/Screens/Play/SongProgressBar.cs
+++ b/osu.Game/Screens/Play/SongProgressBar.cs
@@ -109,7 +109,7 @@ namespace osu.Game.Screens.Play
         {
             var xFill = value * UsableWidth;
             fill.Width = xFill;
-            handleBase.MoveToX(xFill);
+            handleBase.X = xFill;
         }
 
         protected override void OnUserChange() => OnSeek?.Invoke(Current);

From 4a52db14d1781a0a89d8910128dae4cc3161cf10 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Feb 2018 14:18:25 +0900
Subject: [PATCH 2/3] Fix depth of already-visible panels not being updates
 after a sorting change

---
 osu.Game/Screens/Select/BeatmapCarousel.cs | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/osu.Game/Screens/Select/BeatmapCarousel.cs b/osu.Game/Screens/Select/BeatmapCarousel.cs
index 6a6042d7d4..6da6fe6b1e 100644
--- a/osu.Game/Screens/Select/BeatmapCarousel.cs
+++ b/osu.Game/Screens/Select/BeatmapCarousel.cs
@@ -407,12 +407,14 @@ namespace osu.Game.Screens.Select
                     continue;
                 }
 
+                float depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
+
                 // Only add if we're not already part of the content.
                 if (!scrollableContent.Contains(item))
                 {
                     // Makes sure headers are always _below_ items,
                     // and depth flows downward.
-                    item.Depth = i + (item is DrawableCarouselBeatmapSet ? -Items.Count : 0);
+                    item.Depth = depth;
 
                     switch (item.LoadState)
                     {
@@ -426,6 +428,10 @@ namespace osu.Game.Screens.Select
                             break;
                     }
                 }
+                else
+                {
+                    scrollableContent.ChangeChildDepth(item, depth);
+                }
             }
 
             // this is not actually useful right now, but once we have groups may well be.

From a0a215bc4294d617664483b437e8522cef09d687 Mon Sep 17 00:00:00 2001
From: Dean Herbert <pe@ppy.sh>
Date: Wed, 28 Feb 2018 14:22:16 +0900
Subject: [PATCH 3/3] Update framework

---
 osu-framework | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/osu-framework b/osu-framework
index 9a773e62eb..500a791577 160000
--- a/osu-framework
+++ b/osu-framework
@@ -1 +1 @@
-Subproject commit 9a773e62eb246206b918ba4fccf9f2507aaa4595
+Subproject commit 500a791577979669e47eece699d5bd8b9068ee4b