h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-15 18:13:09 +08:00
Code Issues Releases Wiki Activity

Use OsuGame.OverlayActivationMode rather than per-Player

Browse Source
This commit is contained in:
Shane Woolcock 2020-10-06 20:11:48 +10:30
parent 1877312a91
commit 782fc1d60f
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Input/ConfineMouseTracker.cs
View File

@ -8,13 +8,12 @@ using osu.Framework.Graphics;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Overlays; using osu.Game.Overlays;
using osu.Game.Screens.Play;
namespace osu.Game.Input namespace osu.Game.Input
{ {
/// <summary> /// <summary>
/// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>, /// Connects <see cref="OsuSetting.ConfineMouseMode"/> with <see cref="FrameworkSetting.ConfineMouseMode"/>,
/// while optionally binding an <see cref="OverlayActivation"/> mode, usually that of the current <see cref="Player"/>. /// while binding <see cref="OsuGame.OverlayActivationMode"/>.
/// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the /// It is assumed that while overlay activation is <see cref="OverlayActivation.Disabled"/>, we should also confine the
/// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>. /// mouse cursor if it has been requested with <see cref="OsuConfineMouseMode.WhenOverlaysDisabled"/>.
/// </summary> /// </summary>
@ -22,22 +21,16 @@ namespace osu.Game.Input
{ {
private Bindable<ConfineMouseMode> frameworkConfineMode; private Bindable<ConfineMouseMode> frameworkConfineMode;
private Bindable<OsuConfineMouseMode> osuConfineMode; private Bindable<OsuConfineMouseMode> osuConfineMode;
private IBindable<OverlayActivation> overlayActivationMode;
/// <summary>
/// The bindable used to indicate whether gameplay is active.
/// Should be bound to the corresponding bindable of the current <see cref="Player"/>.
/// Defaults to <see cref="OverlayActivation.All"/> to assume that all other screens are considered "not gameplay".
/// </summary>
public IBindable<OverlayActivation> OverlayActivationMode { get; } = new Bindable<OverlayActivation>(OverlayActivation.All);
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load(FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager) private void load(OsuGame game, FrameworkConfigManager frameworkConfigManager, OsuConfigManager osuConfigManager)
{ {
frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode); frameworkConfineMode = frameworkConfigManager.GetBindable<ConfineMouseMode>(FrameworkSetting.ConfineMouseMode);
osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode); osuConfineMode = osuConfigManager.GetBindable<OsuConfineMouseMode>(OsuSetting.ConfineMouseMode);
osuConfineMode.ValueChanged += _ => updateConfineMode(); osuConfineMode.ValueChanged += _ => updateConfineMode();
overlayActivationMode = game.OverlayActivationMode.GetBoundCopy();
OverlayActivationMode.BindValueChanged(_ => updateConfineMode(), true); overlayActivationMode.BindValueChanged(_ => updateConfineMode(), true);
} }
private void updateConfineMode() private void updateConfineMode()
@ -53,7 +46,7 @@ namespace osu.Game.Input
break; break;
case OsuConfineMouseMode.WhenOverlaysDisabled: case OsuConfineMouseMode.WhenOverlaysDisabled:
frameworkConfineMode.Value = OverlayActivationMode.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never; frameworkConfineMode.Value = overlayActivationMode?.Value == OverlayActivation.Disabled ? ConfineMouseMode.Always : ConfineMouseMode.Never;
break; break;
case OsuConfineMouseMode.Always: case OsuConfineMouseMode.Always:

2
osu.Game/Input/OsuConfineMouseMode.cs
View File

@ -23,7 +23,7 @@ namespace osu.Game.Input
Fullscreen, Fullscreen,
/// <summary> /// <summary>
/// The mouse cursor will be locked to the window bounds during gameplay, /// The mouse cursor will be locked to the window bounds while overlays are disabled,
/// but may otherwise move freely. /// but may otherwise move freely.
/// </summary> /// </summary>
[Description("During Gameplay")] [Description("During Gameplay")]

6
osu.Game/Screens/Play/Player.cs
View File

@ -18,7 +18,6 @@ using osu.Framework.Threading;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Configuration; using osu.Game.Configuration;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
using osu.Game.Input;
using osu.Game.IO.Archives; using osu.Game.IO.Archives;
using osu.Game.Online.API; using osu.Game.Online.API;
using osu.Game.Overlays; using osu.Game.Overlays;
@ -67,9 +66,6 @@ namespace osu.Game.Screens.Play
private Bindable<bool> mouseWheelDisabled; private Bindable<bool> mouseWheelDisabled;
[Resolved(CanBeNull = true)]
private ConfineMouseTracker confineMouseTracker { get; set; }
private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>(); private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
public int RestartCount; public int RestartCount;
@ -229,8 +225,6 @@ namespace osu.Game.Screens.Play
DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true); DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
confineMouseTracker?.OverlayActivationMode.BindTo(OverlayActivationMode);
// bind clock into components that require it // bind clock into components that require it
DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused); DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);