Merge branch 'master' into rebind-song-select

osu.Game.Tests/Visual/Settings/TestSceneKeyBindingPanel.cs

@@ -1,13 +1,19 @@
 // Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
 // See the LICENCE file in the repository root for full licence text.
 
+using System.Diagnostics;
+using System.Linq;
 using NUnit.Framework;
+using osu.Framework.Testing;
+using osu.Framework.Threading;
 using osu.Game.Overlays;
+using osu.Game.Overlays.KeyBinding;
+using osuTK.Input;
 
 namespace osu.Game.Tests.Visual.Settings
 {
     [TestFixture]
-    public class TestSceneKeyBindingPanel : OsuTestScene
+    public class TestSceneKeyBindingPanel : OsuManualInputManagerTestScene
     {
         private readonly KeyBindingPanel panel;
 
@@ -21,5 +27,42 @@ namespace osu.Game.Tests.Visual.Settings
             base.LoadComplete();
             panel.Show();
         }
+
+        [Test]
+        public void TestClickTwiceOnClearButton()
+        {
+            KeyBindingRow firstRow = null;
+
+            AddStep("click first row", () =>
+            {
+                firstRow = panel.ChildrenOfType<KeyBindingRow>().First();
+                InputManager.MoveMouseTo(firstRow);
+                InputManager.Click(MouseButton.Left);
+            });
+
+            AddStep("schedule button clicks", () =>
+            {
+                var clearButton = firstRow.ChildrenOfType<KeyBindingRow.ClearButton>().Single();
+
+                InputManager.MoveMouseTo(clearButton);
+
+                int buttonClicks = 0;
+                ScheduledDelegate clickDelegate = null;
+
+                clickDelegate = Scheduler.AddDelayed(() =>
+                {
+                    InputManager.PressButton(MouseButton.Left);
+                    InputManager.ReleaseButton(MouseButton.Left);
+
+                    if (++buttonClicks == 2)
+                    {
+                        // ReSharper disable once AccessToModifiedClosure
+                        Debug.Assert(clickDelegate != null);
+                        // ReSharper disable once AccessToModifiedClosure
+                        clickDelegate.Cancel();
+                    }
+                }, 0, true);
+            });
+        }
     }
 }

osu.Game/Overlays/KeyBinding/KeyBindingRow.cs

@@ -274,6 +274,9 @@ namespace osu.Game.Overlays.KeyBinding
 
         private void clear()
         {
+            if (bindTarget == null)
+                return;
+
             bindTarget.UpdateKeyCombination(InputKey.None);
             finalise();
         }
@@ -333,7 +336,7 @@ namespace osu.Game.Overlays.KeyBinding
             }
         }
 
-        private class ClearButton : TriangleButton
+        public class ClearButton : TriangleButton
         {
             public ClearButton()
             {

osu.Game/Screens/Ranking/Expanded/ExpandedPanelMiddleContent.cs

@@ -211,7 +211,7 @@ namespace osu.Game.Screens.Ranking.Expanded
                         Anchor = Anchor.TopCentre,
                         Origin = Anchor.TopCentre,
                         Font = OsuFont.GetFont(size: 10, weight: FontWeight.SemiBold),
-                        Text = $"Played on {score.Date.ToLocalTime():g}"
+                        Text = $"Played on {score.Date.ToLocalTime():d MMMM yyyy HH:mm}"
                     }
                 }
             };

osu.Game/Screens/Ranking/ScorePanel.cs

@@ -243,5 +243,10 @@ namespace osu.Game.Screens.Ranking
 
             return true;
         }
+
+        public override bool ReceivePositionalInputAt(Vector2 screenSpacePos)
+            => base.ReceivePositionalInputAt(screenSpacePos)
+               || topLayerContainer.ReceivePositionalInputAt(screenSpacePos)
+               || middleLayerContainer.ReceivePositionalInputAt(screenSpacePos);
     }
 }