Merge branch 'master' into math_clamp

osu.Game/Rulesets/UI/DrawableRuleset.cs

@@ -517,6 +517,12 @@ public FallbackSampleStore(ISampleStore primary, ISampleStore secondary)
 
         public BindableDouble Frequency => throw new NotImplementedException();
 
+        public IBindable<double> AggregateVolume => throw new NotImplementedException();
+
+        public IBindable<double> AggregateBalance => throw new NotImplementedException();
+
+        public IBindable<double> AggregateFrequency => throw new NotImplementedException();
+
         public int PlaybackConcurrency
         {
             get => throw new NotImplementedException();

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -452,9 +452,6 @@ protected override void Update()
             if (!itemsCache.IsValid)
                 updateItems();
 
-            if (!scrollPositionCache.IsValid)
-                updateScrollPosition();
-
             // Remove all items that should no longer be on-screen
             scrollableContent.RemoveAll(p => p.Y < visibleUpperBound - p.DrawHeight || p.Y > visibleBottomBound || !p.IsPresent);
 
@@ -519,6 +516,14 @@ protected override void Update()
                 updateItem(p);
         }
 
+        protected override void UpdateAfterChildren()
+        {
+            base.UpdateAfterChildren();
+
+            if (!scrollPositionCache.IsValid)
+                updateScrollPosition();
+        }
+
         protected override void Dispose(bool isDisposing)
         {
             base.Dispose(isDisposing);
@@ -637,9 +642,12 @@ void performMove(float y, float? startY = null)
 
         private void updateScrollPosition()
         {
-            if (scrollTarget != null) scroll.ScrollTo(scrollTarget.Value);
+            if (scrollTarget != null)
+            {
+                scroll.ScrollTo(scrollTarget.Value);
                 scrollPositionCache.Validate();
             }
+        }
 
         /// <summary>
         /// Computes the x-offset of currently visible items. Makes the carousel appear round.