RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2024-12-17 12:25:19 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update mouse confine when gameplay state changes

Browse Source
This commit is contained in:
Shane Woolcock 2020-08-16 23:11:09 +09:30
parent 00f15231bc
commit 85b3fff9c8
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -18,6 +18,7 @@ using osu.Framework.Threading;
using osu.Game.Beatmaps;
using osu.Game.Configuration;
using osu.Game.Graphics.Containers;
using osu.Game.Input;
using osu.Game.IO.Archives;
using osu.Game.Online.API;
using osu.Game.Overlays;
@ -63,6 +64,9 @@ namespace osu.Game.Screens.Play
private Bindable<bool> mouseWheelDisabled;
[Resolved(CanBeNull = true)]
private ConfineMouseTracker confineMouseTracker { get; set; }
private readonly Bindable<bool> storyboardReplacesBackground = new Bindable<bool>();
public int RestartCount;
@ -197,10 +201,15 @@ namespace osu.Game.Screens.Play
skipOverlay.Hide();
}
DrawableRuleset.HasReplayLoaded.BindValueChanged(_ => updatePauseOnFocusLostState(), true);
DrawableRuleset.HasReplayLoaded.BindValueChanged(_ =>
{
updatePauseOnFocusLostState();
updateConfineMouse();
}, true);
// bind clock into components that require it
DrawableRuleset.IsPaused.BindTo(GameplayClockContainer.IsPaused);
DrawableRuleset.IsPaused.ValueChanged += _ => updateConfineMouse();
DrawableRuleset.OnNewResult += r =>
{
@ -346,6 +355,12 @@ namespace osu.Game.Screens.Play
&& !DrawableRuleset.HasReplayLoaded.Value
&& !breakTracker.IsBreakTime.Value;
private void updateConfineMouse()
{
if (confineMouseTracker != null)
confineMouseTracker.GameplayActive = !GameplayClockContainer.IsPaused.Value && !DrawableRuleset.HasReplayLoaded.Value && !HasFailed;
}
private IBeatmap loadPlayableBeatmap()
{
IBeatmap playable;
@ -379,7 +394,7 @@ namespace osu.Game.Screens.Play
}
catch (Exception e)
{
Logger.Error(e, "Could not load beatmap sucessfully!");
Logger.Error(e, "Could not load beatmap successfully!");
//couldn't load, hard abort!
return null;
}