Merge branch 'master' into add-bindable-for-break-times

osu.Game/Screens/Multi/Lounge/Components/FilterControl.cs

@@ -14,6 +14,7 @@ namespace osu.Game.Screens.Multi.Lounge.Components
     {
         protected override Color4 BackgroundColour => OsuColour.FromHex(@"362e42");
         protected override PrimaryFilter DefaultTab => PrimaryFilter.Open;
+        protected override SecondaryFilter DefaultCategory => SecondaryFilter.Public;
 
         protected override float ContentHorizontalPadding => base.ContentHorizontalPadding + OsuScreen.HORIZONTAL_OVERFLOW_PADDING;
 

osu.Game/Screens/Play/Player.cs

@@ -255,7 +255,7 @@ namespace osu.Game.Screens.Play
         private void performImmediateExit()
         {
             // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
-            onCompletionEvent = null;
+            completionProgressDelegate?.Cancel();
 
             ValidForResume = false;
 
@@ -275,20 +275,16 @@ namespace osu.Game.Screens.Play
 
             sampleRestart?.Play();
 
-            // if a restart has been requested, cancel any pending completion (user has shown intent to restart).
-            onCompletionEvent = null;
-
-            ValidForResume = false;
             RestartRequested?.Invoke();
-            this.Exit();
+            performImmediateExit();
         }
 
-        private ScheduledDelegate onCompletionEvent;
+        private ScheduledDelegate completionProgressDelegate;
 
         private void onCompletion()
         {
             // Only show the completion screen if the player hasn't failed
-            if (ScoreProcessor.HasFailed || onCompletionEvent != null)
+            if (ScoreProcessor.HasFailed || completionProgressDelegate != null)
                 return;
 
             ValidForResume = false;
@@ -297,7 +293,7 @@ namespace osu.Game.Screens.Play
 
             using (BeginDelayedSequence(1000))
             {
-                onCompletionEvent = Schedule(delegate
+                completionProgressDelegate = Schedule(delegate
                 {
                     if (!this.IsCurrentScreen()) return;
 
@@ -306,8 +302,6 @@ namespace osu.Game.Screens.Play
                         scoreManager.Import(score).Wait();
 
                     this.Push(CreateResults(score));
-
-                    onCompletionEvent = null;
                 });
             }
         }
@@ -471,10 +465,10 @@ namespace osu.Game.Screens.Play
 
         public override bool OnExiting(IScreen next)
         {
-            if (onCompletionEvent != null)
+            if (completionProgressDelegate != null && !completionProgressDelegate.Cancelled && !completionProgressDelegate.Completed)
             {
-                // Proceed to result screen if beatmap already finished playing
-                onCompletionEvent.RunTask();
+                // proceed to result screen if beatmap already finished playing
+                completionProgressDelegate.RunTask();
                 return true;
             }
 

osu.Game/Screens/Select/BeatmapDetails.cs

@@ -35,7 +35,7 @@ namespace osu.Game.Screens.Select
         private readonly MetadataSection description, source, tags;
         private readonly Container failRetryContainer;
         private readonly FailRetryGraph failRetryGraph;
-        private readonly DimmedLoadingAnimation loading;
+        private readonly DimmedLoadingLayer loading;
 
         private IAPIProvider api;
 
@@ -156,10 +156,7 @@ namespace osu.Game.Screens.Select
                         },
                     },
                 },
-                loading = new DimmedLoadingAnimation
-                {
-                    RelativeSizeAxes = Axes.Both,
-                },
+                loading = new DimmedLoadingLayer(),
             };
         }
 
@@ -365,35 +362,5 @@ namespace osu.Game.Screens.Select
                 });
             }
         }
-
-        private class DimmedLoadingAnimation : VisibilityContainer
-        {
-            private readonly LoadingAnimation loading;
-
-            public DimmedLoadingAnimation()
-            {
-                Children = new Drawable[]
-                {
-                    new Box
-                    {
-                        RelativeSizeAxes = Axes.Both,
-                        Colour = Color4.Black.Opacity(0.5f),
-                    },
-                    loading = new LoadingAnimation(),
-                };
-            }
-
-            protected override void PopIn()
-            {
-                this.FadeIn(transition_duration, Easing.OutQuint);
-                loading.Show();
-            }
-
-            protected override void PopOut()
-            {
-                this.FadeOut(transition_duration, Easing.OutQuint);
-                loading.Hide();
-            }
-        }
     }
 }

osu.Game/Screens/Select/BeatmapInfoWedge.cs

@@ -141,6 +141,7 @@ namespace osu.Game.Screens.Select
             private readonly RulesetInfo ruleset;
 
             public BufferedWedgeInfo(WorkingBeatmap beatmap, RulesetInfo userRuleset)
+                : base(pixelSnapping: true)
             {
                 this.beatmap = beatmap;
                 ruleset = userRuleset ?? beatmap.BeatmapInfo.Ruleset;
@@ -152,7 +153,6 @@ namespace osu.Game.Screens.Select
                 var beatmapInfo = beatmap.BeatmapInfo;
                 var metadata = beatmapInfo.Metadata ?? beatmap.BeatmapSetInfo?.Metadata ?? new BeatmapMetadata();
 
-                PixelSnapping = true;
                 CacheDrawnFrameBuffer = true;
                 RelativeSizeAxes = Axes.Both;
 

osu.Game/Screens/Select/Footer.cs

@@ -94,7 +94,7 @@ namespace osu.Game.Screens.Select
                         buttons = new FillFlowContainer<FooterButton>
                         {
                             Direction = FillDirection.Horizontal,
-                            Spacing = new Vector2(0.2f, 0),
+                            Spacing = new Vector2(-FooterButton.SHEAR_WIDTH, 0),
                             AutoSizeAxes = Axes.Both,
                         }
                     }

osu.Game/Screens/Select/FooterButton.cs

@@ -17,7 +17,9 @@ namespace osu.Game.Screens.Select
 {
     public class FooterButton : OsuClickableContainer
     {
-        private static readonly Vector2 shearing = new Vector2(0.15f, 0);
+        public static readonly float SHEAR_WIDTH = 7.5f;
+
+        protected static readonly Vector2 SHEAR = new Vector2(SHEAR_WIDTH / Footer.HEIGHT, 0);
 
         public string Text
         {
@@ -59,37 +61,35 @@ namespace osu.Game.Screens.Select
         private readonly Box box;
         private readonly Box light;
 
-        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => box.ReceivePositionalInputAt(screenSpacePos);
-
         public FooterButton()
         {
             AutoSizeAxes = Axes.Both;
+            Shear = SHEAR;
             Children = new Drawable[]
             {
-                TextContainer = new Container
-                {
-                    Size = new Vector2(100, 50),
-                    Child = SpriteText = new OsuSpriteText
-                    {
-                        Anchor = Anchor.Centre,
-                        Origin = Anchor.Centre,
-                    }
-                },
                 box = new Box
                 {
                     RelativeSizeAxes = Axes.Both,
-                    Shear = shearing,
                     EdgeSmoothness = new Vector2(2, 0),
                     Colour = Color4.White,
                     Alpha = 0,
                 },
                 light = new Box
                 {
-                    Shear = shearing,
                     Height = 4,
                     EdgeSmoothness = new Vector2(2, 0),
                     RelativeSizeAxes = Axes.X,
                 },
+                TextContainer = new Container
+                {
+                    Size = new Vector2(100 - SHEAR_WIDTH, 50),
+                    Shear = -SHEAR,
+                    Child = SpriteText = new OsuSpriteText
+                    {
+                        Anchor = Anchor.Centre,
+                        Origin = Anchor.Centre,
+                    }
+                },
             };
         }
 

osu.Game/Screens/Select/FooterButtonMods.cs

@@ -32,6 +32,7 @@ namespace osu.Game.Screens.Select
             {
                 Anchor = Anchor.CentreLeft,
                 Origin = Anchor.CentreLeft,
+                Shear = -SHEAR,
                 Child = modDisplay = new FooterModDisplay
                 {
                     DisplayUnrankedText = false,