h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-12 18:23:04 +08:00
Code Issues Releases Wiki Activity

Move the key handling logic to MainMenu and simplify it

Browse Source 
Also makes use of the host.SuspendToBackground() return value.
This commit is contained in:
Susko3 2022-02-23 14:06:22 +01:00
parent 3eee505aa2
commit 5dd0d48df9
2 changed files with 32 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
osu.Game/Screens/Menu/ExitConfirmOverlay.cs
View File

@ -3,7 +3,6 @@
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Game.Configuration;
using osu.Game.Input.Bindings;
using osu.Game.Overlays;
@ -43,26 +42,4 @@ namespace osu.Game.Screens.Menu
}
}
}
/// <summary>
/// An <see cref="ExitConfirmOverlay"/> that behaves as if the <see cref="OsuSetting.UIHoldActivationDelay"/> is always <c>0</c>.
/// </summary>
/// <remarks>This is useful for mobile devices using gesture navigation, where holding to confirm is not possible.</remarks>
public class NoHoldExitConfirmOverlay : ExitConfirmOverlay, IKeyBindingHandler<GlobalAction>
{
public new bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
if (e.Repeat)
return false;
if (e.Action == GlobalAction.Back)
{
Progress.Value = 1;
Confirm();
return true;
}
return false;
}
}
}

59
osu.Game/Screens/Menu/MainMenu.cs
View File

@ -6,12 +6,15 @@ using osu.Framework.Allocation;
using osu.Framework.Audio;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Input.Bindings;
using osu.Framework.Input.Events;
using osu.Framework.Platform;
using osu.Framework.Screens;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Input.Bindings;
using osu.Game.IO;
using osu.Game.Online.API;
using osu.Game.Overlays;
@ -26,7 +29,7 @@ using osuTK.Graphics;
namespace osu.Game.Screens.Menu
{
public class MainMenu : OsuScreen, IHandlePresentBeatmap
public class MainMenu : OsuScreen, IHandlePresentBeatmap, IKeyBindingHandler<GlobalAction>
{
public const float FADE_IN_DURATION = 300;
@ -90,14 +93,6 @@ namespace osu.Game.Screens.Menu
}
});
}
else if (host.CanSuspendToBackground)
{
AddInternal(exitConfirmOverlay = new NoHoldExitConfirmOverlay
{
// treat as if the UIHoldActivationDelay is always 0. see NoHoldExitConfirmOverlay xmldoc for more info.
Action = this.Exit
});
}
AddRangeInternal(new[]
{
@ -157,24 +152,6 @@ namespace osu.Game.Screens.Menu
private void confirmAndExit()
{
if (host.CanSuspendToBackground)
{
// cancel the overlay as we're not actually exiting.
// this is the same action as 'onCancel' in `ConfirmExitDialog`.
exitConfirmOverlay.Abort();
// fade the track so the Bass.Pause() on suspend isn't as jarring.
const double fade_time = 500;
musicController.CurrentTrack
.VolumeTo(0, fade_time, Easing.Out).Then()
.VolumeTo(1, fade_time, Easing.In);
host.SuspendToBackground();
// on hosts that can only suspend, we don't ever want to exit the game.
return;
}
if (exitConfirmed) return;
exitConfirmed = true;
@ -324,5 +301,33 @@ namespace osu.Game.Screens.Menu
Schedule(loadSoloSongSelect);
}
public bool OnPressed(KeyBindingPressEvent<GlobalAction> e)
{
if (e.Repeat)
return false;
if (e.Action == GlobalAction.Back && host.CanSuspendToBackground)
{
bool didSuspend = host.SuspendToBackground();
if (didSuspend)
{
// fade the track so the Bass.Pause() on suspend isn't as jarring.
const double fade_time = 500;
musicController.CurrentTrack
.VolumeTo(0, fade_time, Easing.Out).Then()
.VolumeTo(1, fade_time, Easing.In);
return true;
}
}
return false;
}
public void OnReleased(KeyBindingReleaseEvent<GlobalAction> e)
{
}
}
}