Merge 58cf1c11e4 into aa0ee5cf3a

Fix quick retry transition from results screen

osu.Game.Tests/Visual/UserInterface/TestSceneContextMenu.cs

@@ -101,7 +101,16 @@ namespace osu.Game.Tests.Visual.UserInterface
                                     }
                                 }
                             }
-                        }
+                        },
+                    }
+                },
+                new OsuMenuItem(@"Another nested option")
+                {
+                    Items = new MenuItem[]
+                    {
+                        new OsuMenuItem(@"Sub-One"),
+                        new OsuMenuItem(@"Sub-Two"),
+                        new OsuMenuItem(@"Sub-Three"),
                     }
                 },
                 new OsuMenuItem(@"Choose me please"),

osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs

@@ -11,16 +11,8 @@ namespace osu.Game.Graphics.Cursor
     [Cached(typeof(OsuContextMenuContainer))]
     public partial class OsuContextMenuContainer : ContextMenuContainer
     {
-        [Cached]
-        private OsuContextMenuSamples samples = new OsuContextMenuSamples();
-
         private OsuContextMenu menu = null!;
 
-        public OsuContextMenuContainer()
-        {
-            AddInternal(samples);
-        }
-
         protected override Menu CreateMenu() => menu = new OsuContextMenu(true);
 
         public void CloseMenu()

osu.Game/Graphics/UserInterface/HoverSampleSet.cs

@@ -23,6 +23,9 @@ namespace osu.Game.Graphics.UserInterface
         DialogCancel,
 
         [Description("dialog-ok")]
-        DialogOk
+        DialogOk,
+
+        [Description("menu-open")]
+        MenuOpen,
     }
 }

osu.Game/Graphics/UserInterface/OsuContextMenu.cs

@@ -15,7 +15,7 @@ namespace osu.Game.Graphics.UserInterface
         private const int fade_duration = 250;
 
         [Resolved]
-        private OsuContextMenuSamples samples { get; set; } = null!;
+        private OsuMenuSamples menuSamples { get; set; } = null!;
 
         // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed.
         private bool wasOpened;
@@ -47,15 +47,14 @@ namespace osu.Game.Graphics.UserInterface
 
         protected override void AnimateOpen()
         {
+            wasOpened = true;
             this.FadeIn(fade_duration, Easing.OutQuint);
 
-            if (playClickSample)
-                samples.PlayClickSample();
+            if (!playClickSample)
+                return;
 
-            if (!wasOpened)
-                samples.PlayOpenSample();
-
-            wasOpened = true;
+            menuSamples?.PlayClickSample();
+            menuSamples?.PlayOpenSample();
         }
 
         protected override void AnimateClose()
@@ -63,7 +62,7 @@ namespace osu.Game.Graphics.UserInterface
             this.FadeOut(fade_duration, Easing.OutQuint);
 
             if (wasOpened)
-                samples.PlayCloseSample();
+                menuSamples?.PlayCloseSample();
 
             wasOpened = false;
         }

osu.Game/Graphics/UserInterface/OsuContextMenuSamples.cs

@@ -1,37 +0,0 @@
-// 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.
-
-#nullable disable
-
-using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
-using osu.Framework.Extensions;
-using osu.Framework.Graphics;
-
-namespace osu.Game.Graphics.UserInterface
-{
-    public partial class OsuContextMenuSamples : Component
-    {
-        private Sample sampleClick;
-        private Sample sampleOpen;
-        private Sample sampleClose;
-
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleClick = audio.Samples.Get($@"UI/{HoverSampleSet.Default.GetDescription()}-select");
-            sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
-            sampleClose = audio.Samples.Get(@"UI/dropdown-close");
-        }
-
-        public void PlayClickSample() => Scheduler.AddOnce(playClickSample);
-        private void playClickSample() => sampleClick.Play();
-
-        public void PlayOpenSample() => Scheduler.AddOnce(playOpenSample);
-        private void playOpenSample() => sampleOpen.Play();
-
-        public void PlayCloseSample() => Scheduler.AddOnce(playCloseSample);
-        private void playCloseSample() => sampleClose.Play();
-    }
-}

osu.Game/Graphics/UserInterface/OsuMenu.cs

@@ -4,8 +4,6 @@
 #nullable disable
 
 using osu.Framework.Allocation;
-using osu.Framework.Audio;
-using osu.Framework.Audio.Sample;
 using osu.Framework.Extensions.Color4Extensions;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
@@ -20,12 +18,12 @@ namespace osu.Game.Graphics.UserInterface
 {
     public partial class OsuMenu : Menu
     {
-        private Sample sampleOpen;
-        private Sample sampleClose;
-
         // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed.
         private bool wasOpened;
 
+        [Resolved]
+        private OsuMenuSamples menuSamples { get; set; } = null!;
+
         public OsuMenu(Direction direction, bool topLevelMenu = false)
             : base(direction, topLevelMenu)
         {
@@ -33,13 +31,8 @@ namespace osu.Game.Graphics.UserInterface
 
             MaskingContainer.CornerRadius = 4;
             ItemsContainer.Padding = new MarginPadding(5);
-        }
 
-        [BackgroundDependencyLoader]
-        private void load(AudioManager audio)
-        {
-            sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
-            sampleClose = audio.Samples.Get(@"UI/dropdown-close");
+            OnSubmenuOpen += _ => { menuSamples?.PlaySubOpenSample(); };
         }
 
         protected override void Update()
@@ -64,7 +57,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override void AnimateOpen()
         {
             if (!TopLevelMenu && !wasOpened)
-                sampleOpen?.Play();
+                menuSamples?.PlayOpenSample();
 
             this.FadeIn(300, Easing.OutQuint);
             wasOpened = true;
@@ -73,7 +66,7 @@ namespace osu.Game.Graphics.UserInterface
         protected override void AnimateClose()
         {
             if (!TopLevelMenu && wasOpened)
-                sampleClose?.Play();
+                menuSamples?.PlayCloseSample();
 
             this.FadeOut(300, Easing.OutQuint);
             wasOpened = false;

osu.Game/Graphics/UserInterface/OsuMenuSamples.cs

@@ -0,0 +1,70 @@
+// 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.
+
+#nullable disable
+
+using osu.Framework.Allocation;
+using osu.Framework.Audio;
+using osu.Framework.Audio.Sample;
+using osu.Framework.Graphics;
+
+namespace osu.Game.Graphics.UserInterface
+{
+    public partial class OsuMenuSamples : Component
+    {
+        private Sample sampleClick;
+        private Sample sampleOpen;
+        private Sample sampleSubOpen;
+        private Sample sampleClose;
+
+        private bool triggerOpen;
+        private bool triggerSubOpen;
+        private bool triggerClose;
+
+        [BackgroundDependencyLoader]
+        private void load(AudioManager audio)
+        {
+            sampleClick = audio.Samples.Get(@"UI/menu-open-select");
+            sampleOpen = audio.Samples.Get(@"UI/menu-open");
+            sampleSubOpen = audio.Samples.Get(@"UI/menu-sub-open");
+            sampleClose = audio.Samples.Get(@"UI/menu-close");
+        }
+
+        public void PlayClickSample()
+        {
+            Scheduler.AddOnce(playClickSample);
+        }
+
+        public void PlayOpenSample()
+        {
+            triggerOpen = true;
+            Scheduler.AddOnce(resolvePlayback);
+        }
+
+        public void PlaySubOpenSample()
+        {
+            triggerSubOpen = true;
+            Scheduler.AddOnce(resolvePlayback);
+        }
+
+        public void PlayCloseSample()
+        {
+            triggerClose = true;
+            Scheduler.AddOnce(resolvePlayback);
+        }
+
+        private void playClickSample() => sampleClick.Play();
+
+        private void resolvePlayback()
+        {
+            if (triggerSubOpen)
+                sampleSubOpen?.Play();
+            else if (triggerOpen)
+                sampleOpen?.Play();
+            else if (triggerClose)
+                sampleClose?.Play();
+
+            triggerOpen = triggerSubOpen = triggerClose = false;
+        }
+    }
+}

osu.Game/OsuGameBase.cs

@@ -41,6 +41,7 @@ using osu.Game.Database;
 using osu.Game.Extensions;
 using osu.Game.Graphics;
 using osu.Game.Graphics.Cursor;
+using osu.Game.Graphics.UserInterface;
 using osu.Game.Input;
 using osu.Game.Input.Bindings;
 using osu.Game.IO;
@@ -383,6 +384,10 @@ namespace osu.Game
 
             GlobalActionContainer globalBindings;
 
+            OsuMenuSamples menuSamples;
+            dependencies.Cache(menuSamples = new OsuMenuSamples());
+            base.Content.Add(menuSamples);
+
             base.Content.Add(SafeAreaContainer = new SafeAreaContainer
             {
                 SafeAreaOverrideEdges = SafeAreaOverrideEdges,

osu.Game/Screens/Edit/Components/Menus/EditorMenuBar.cs

@@ -99,7 +99,7 @@ namespace osu.Game.Screens.Edit.Components.Menus
                 ForegroundColourHover = colourProvider.Content1;
                 BackgroundColourHover = colourProvider.Background1;
 
-                AddInternal(hoverClickSounds = new HoverClickSounds());
+                AddInternal(hoverClickSounds = new HoverClickSounds(HoverSampleSet.MenuOpen));
             }
 
             protected override void LoadComplete()

osu.Game/Screens/Ranking/ResultsScreen.cs

@@ -55,6 +55,8 @@ namespace osu.Game.Screens.Ranking
         [Resolved]
         private Player? player { get; set; }
 
+        private bool skipExitTransition;
+
         [Resolved]
         private IAPIProvider api { get; set; } = null!;
 
@@ -203,6 +205,7 @@ namespace osu.Game.Screens.Ranking
                     {
                         if (!this.IsCurrentScreen()) return;
 
+                        skipExitTransition = true;
                         player?.Restart(true);
                     },
                 });
@@ -313,7 +316,8 @@ namespace osu.Game.Screens.Ranking
             // HitObject references from HitEvent.
             Score?.HitEvents.Clear();
 
-            this.FadeOut(100);
+            if (!skipExitTransition)
+                this.FadeOut(100);
             return false;
         }