Merge branch 'master' into fix-mod-button-sounds

osu.Game.Rulesets.Osu/UI/Cursor/GameplayCursor.cs

@@ -11,6 +11,7 @@ using osu.Framework.Graphics.Shapes;
 using osu.Framework.Input.Bindings;
 using osu.Game.Beatmaps;
 using osu.Game.Configuration;
+using osu.Game.Skinning;
 using OpenTK;
 using OpenTK.Graphics;
 
@@ -82,7 +83,7 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
 
         public class OsuCursor : Container
         {
-            private Container cursorContainer;
+            private Drawable cursorContainer;
 
             private Bindable<double> cursorScale;
             private Bindable<bool> autoCursorScale;
@@ -97,66 +98,66 @@ namespace osu.Game.Rulesets.Osu.UI.Cursor
             [BackgroundDependencyLoader]
             private void load(OsuConfigManager config, OsuGameBase game)
             {
-                Children = new Drawable[]
+                Child = cursorContainer = new SkinnableDrawable("cursor", _ => new CircularContainer
                 {
-                    cursorContainer = new CircularContainer
+                    RelativeSizeAxes = Axes.Both,
+                    Masking = true,
+                    BorderThickness = Size.X / 6,
+                    BorderColour = Color4.White,
+                    EdgeEffect = new EdgeEffectParameters
                     {
-                        Origin = Anchor.Centre,
+                        Type = EdgeEffectType.Shadow,
-                        Anchor = Anchor.Centre,
+                        Colour = Color4.Pink.Opacity(0.5f),
-                        RelativeSizeAxes = Axes.Both,
+                        Radius = 5,
-                        Masking = true,
-                        BorderThickness = Size.X / 6,
-                        BorderColour = Color4.White,
-                        EdgeEffect = new EdgeEffectParameters
-                        {
-                            Type = EdgeEffectType.Shadow,
-                            Colour = Color4.Pink.Opacity(0.5f),
-                            Radius = 5,
-                        },
-                        Children = new Drawable[]
-                        {
-                            new Box
-                            {
-                                RelativeSizeAxes = Axes.Both,
-                                Alpha = 0,
-                                AlwaysPresent = true,
-                            },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Masking = true,
-                                BorderThickness = Size.X / 3,
-                                BorderColour = Color4.White.Opacity(0.5f),
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Alpha = 0,
-                                        AlwaysPresent = true,
-                                    },
-                                },
-                            },
-                            new CircularContainer
-                            {
-                                Origin = Anchor.Centre,
-                                Anchor = Anchor.Centre,
-                                RelativeSizeAxes = Axes.Both,
-                                Scale = new Vector2(0.1f),
-                                Masking = true,
-                                Children = new Drawable[]
-                                {
-                                    new Box
-                                    {
-                                        RelativeSizeAxes = Axes.Both,
-                                        Colour = Color4.White,
-                                    },
-                                },
-                            },
-                        }
                     },
+                    Children = new Drawable[]
+                    {
+                        new Box
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            Alpha = 0,
+                            AlwaysPresent = true,
+                        },
+                        new CircularContainer
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Masking = true,
+                            BorderThickness = Size.X / 3,
+                            BorderColour = Color4.White.Opacity(0.5f),
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Alpha = 0,
+                                    AlwaysPresent = true,
+                                },
+                            },
+                        },
+                        new CircularContainer
+                        {
+                            Origin = Anchor.Centre,
+                            Anchor = Anchor.Centre,
+                            RelativeSizeAxes = Axes.Both,
+                            Scale = new Vector2(0.1f),
+                            Masking = true,
+                            Children = new Drawable[]
+                            {
+                                new Box
+                                {
+                                    RelativeSizeAxes = Axes.Both,
+                                    Colour = Color4.White,
+                                },
+                            },
+                        },
+                    }
+                }, restrictSize: false)
+                {
+                    Origin = Anchor.Centre,
+                    Anchor = Anchor.Centre,
+                    RelativeSizeAxes = Axes.Both,
                 };
 
                 beatmap = game.Beatmap.GetBoundCopy();

osu.Game/Overlays/Volume/VolumeMeter.cs

@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Effects;
 using osu.Framework.Graphics.Shapes;
 using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Bindings;
+using osu.Framework.MathUtils;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Sprites;
 using osu.Game.Input.Bindings;
@@ -93,19 +94,25 @@ namespace osu.Game.Overlays.Volume
                         Colour = colours.Gray2,
                         Size = new Vector2(0.8f)
                     },
-                    (volumeCircle = new CircularProgress
+                    new Container
                     {
-                        RelativeSizeAxes = Axes.Both,
-                        InnerRadius = 0.05f,
-                        Rotation = 180,
                         Anchor = Anchor.Centre,
                         Origin = Anchor.Centre,
-                        Size = new Vector2(0.8f)
+                        RelativeSizeAxes = Axes.Both,
-                    }).WithEffect(new GlowEffect
+                        Size = new Vector2(0.8f),
-                    {
+                        Padding = new MarginPadding(-Blur.KernelSize(5)),
-                        Colour = meterColour,
+                        Rotation = 180,
-                        Strength = 2
+                        Child = (volumeCircle = new CircularProgress
-                    }),
+                        {
+                            RelativeSizeAxes = Axes.Both,
+                            InnerRadius = 0.05f,
+                        }).WithEffect(new GlowEffect
+                        {
+                            Colour = meterColour,
+                            Strength = 2,
+                            PadExtent = true
+                        }),
+                    },
                     maxGlow = (text = new OsuSpriteText
                     {
                         Anchor = Anchor.Centre,

osu.Game/Screens/Play/PlayerLoader.cs

@@ -1,6 +1,7 @@
 // Copyright (c) 2007-2018 ppy Pty Ltd <contact@ppy.sh>.
 // Licensed under the MIT Licence - https://raw.githubusercontent.com/ppy/osu/master/LICENCE
 
+using System.Threading.Tasks;
 using osu.Framework.Allocation;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -27,6 +28,8 @@ namespace osu.Game.Screens.Play
         private bool showOverlays = true;
         public override bool ShowOverlaysOnEnter => showOverlays;
 
+        private Task loadTask;
+
         public PlayerLoader(Player player)
         {
             this.player = player;
@@ -55,7 +58,7 @@ namespace osu.Game.Screens.Play
                 Margin = new MarginPadding(25)
             });
 
-            LoadComponentAsync(player);
+            loadTask = LoadComponentAsync(player);
         }
 
         protected override void OnResuming(Screen last)
@@ -65,7 +68,7 @@ namespace osu.Game.Screens.Play
             contentIn();
 
             //we will only be resumed if the player has requested a re-run (see ValidForResume setting above)
-            LoadComponentAsync(player = new Player
+            loadTask = LoadComponentAsync(player = new Player
             {
                 RestartCount = player.RestartCount + 1,
                 RestartRequested = player.RestartRequested,
@@ -154,6 +157,8 @@ namespace osu.Game.Screens.Play
                     {
                         if (!IsCurrentScreen) return;
 
+                        loadTask = null;
+
                         if (!Push(player))
                             Exit();
                         else
@@ -192,6 +197,14 @@ namespace osu.Game.Screens.Play
             return base.OnExiting(next);
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+
+            // if the player never got pushed, we should explicitly dispose it.
+            loadTask?.ContinueWith(_ => player.Dispose());
+        }
+
         private class BeatmapMetadataDisplay : Container
         {
             private class MetadataLine : Container

osu.Game/Screens/Select/BeatmapCarousel.cs

@@ -328,7 +328,10 @@ namespace osu.Game.Screens.Select
         public void FlushPendingFilterOperations()
         {
             if (FilterTask?.Completed == false)
+            {
                 applyActiveCriteria(false, false);
+                Update();
+            }
         }
 
         public void Filter(FilterCriteria newCriteria, bool debounce = true)

osu.Game/Skinning/LocalSkinOverrideContainer.cs

@@ -48,13 +48,15 @@ namespace osu.Game.Skinning
             this.source = source;
         }
 
+        private void onSourceChanged() => SourceChanged?.Invoke();
+
         protected override IReadOnlyDependencyContainer CreateLocalDependencies(IReadOnlyDependencyContainer parent)
         {
             var dependencies = new DependencyContainer(base.CreateLocalDependencies(parent));
 
             fallbackSource = dependencies.Get<ISkinSource>();
             if (fallbackSource != null)
-                fallbackSource.SourceChanged += () => SourceChanged?.Invoke();
+                fallbackSource.SourceChanged += onSourceChanged;
 
             dependencies.CacheAs<ISkinSource>(this);
 
@@ -66,7 +68,7 @@ namespace osu.Game.Skinning
             base.Dispose(isDisposing);
 
             if (fallbackSource != null)
-                fallbackSource.SourceChanged -= SourceChanged;
+                fallbackSource.SourceChanged -= onSourceChanged;
         }
     }
 }