h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-15 05:42:56 +08:00
Code Issues Releases Wiki Activity

Fix nested menus layering close samples if multiple menu levels are closed

Browse Source
This commit is contained in:
Bartłomiej Dach 2021-08-07 14:19:05 +02:00
parent 52400961f6
commit 4268e4d750
No known key found for this signature in database
GPG Key ID: BCECCD4FA41F6497
3 changed files with 52 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
osu.Game/Graphics/Cursor/OsuContextMenuContainer.cs
View File

@ -1,6 +1,7 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Allocation;
using osu.Framework.Graphics.Cursor; using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.UserInterface; using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
@ -9,6 +10,14 @@ namespace osu.Game.Graphics.Cursor
{ {
public class OsuContextMenuContainer : ContextMenuContainer public class OsuContextMenuContainer : ContextMenuContainer
{ {
[Cached]
private OsuContextMenuSamples samples = new OsuContextMenuSamples();
public OsuContextMenuContainer()
{
AddInternal(samples);
}
protected override Menu CreateMenu() => new OsuContextMenu(true); protected override Menu CreateMenu() => new OsuContextMenu(true);
} }
} }

29
osu.Game/Graphics/UserInterface/OsuContextMenu.cs
View File

@ -4,8 +4,6 @@
using osuTK.Graphics; using osuTK.Graphics;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Audio; using osu.Framework.Audio;
using osu.Framework.Audio.Sample;
using osu.Framework.Extensions;
using osu.Framework.Extensions.Color4Extensions; using osu.Framework.Extensions.Color4Extensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Effects; using osu.Framework.Graphics.Effects;
@ -16,16 +14,15 @@ namespace osu.Game.Graphics.UserInterface
public class OsuContextMenu : OsuMenu public class OsuContextMenu : OsuMenu
{ {
private const int fade_duration = 250; private const int fade_duration = 250;
private Sample sampleOpen;
private Sample sampleClose; [Resolved]
private Sample sampleClick; private OsuContextMenuSamples samples { get; set; }
// todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed. // todo: this shouldn't be required after https://github.com/ppy/osu-framework/issues/4519 is fixed.
private bool wasOpened; private bool wasOpened;
private readonly bool playClickSample; private readonly bool playClickSample;
private readonly Menu parentMenu;
public OsuContextMenu(bool playClickSample = false, Menu parentMenu = null) public OsuContextMenu(bool playClickSample = false)
: base(Direction.Vertical) : base(Direction.Vertical)
{ {
MaskingContainer.CornerRadius = 5; MaskingContainer.CornerRadius = 5;
@ -41,16 +38,12 @@ namespace osu.Game.Graphics.UserInterface
MaxHeight = 250; MaxHeight = 250;
this.playClickSample = playClickSample; this.playClickSample = playClickSample;
this.parentMenu = parentMenu;
} }
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(OsuColour colours, AudioManager audio) private void load(OsuColour colours, AudioManager audio)
{ {
BackgroundColour = colours.ContextMenuGray; BackgroundColour = colours.ContextMenuGray;
sampleClick = audio.Samples.Get($"UI/{HoverSampleSet.Default.GetDescription()}-select");
sampleOpen = audio.Samples.Get(@"UI/dropdown-open");
sampleClose = audio.Samples.Get(@"UI/dropdown-close");
} }
protected override void AnimateOpen() protected override void AnimateOpen()
@ -58,10 +51,10 @@ namespace osu.Game.Graphics.UserInterface
this.FadeIn(fade_duration, Easing.OutQuint); this.FadeIn(fade_duration, Easing.OutQuint);
if (playClickSample) if (playClickSample)
sampleClick?.Play(); samples.PlayClickSample();
if (!wasOpened) if (!wasOpened)
sampleOpen?.Play(); samples.PlayOpenSample();
wasOpened = true; wasOpened = true;
} }
@ -70,18 +63,12 @@ namespace osu.Game.Graphics.UserInterface
{ {
this.FadeOut(fade_duration, Easing.OutQuint); this.FadeOut(fade_duration, Easing.OutQuint);
if (parentMenu?.State == MenuState.Closed)
{
wasOpened = false;
return;
}
if (wasOpened) if (wasOpened)
sampleClose?.Play(); samples.PlayCloseSample();
wasOpened = false; wasOpened = false;
} }
protected override Menu CreateSubMenu() => new OsuContextMenu(false, this); protected override Menu CreateSubMenu() => new OsuContextMenu();
} }
} }

35
osu.Game/Graphics/UserInterface/OsuContextMenuSamples.cs Normal file
View File

@ -0,0 +1,35 @@
// 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 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 class OsuContextMenuSamples : Component
{
private Sample sampleClick;
private Sample sampleOpen;
private Sample sampleClose;
[BackgroundDependencyLoader]
private void load(OsuColour colours, 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();
}
}