h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-09-22 05:27:23 +08:00
Code Issues Releases Wiki Activity

Fix gameplay mouse button disable setting no longer having any effect

Browse Source 
Regressed at 50091252e2 (diff-20562da8cde558aacafa9540b97b7975)
This commit is contained in:
Dean Herbert 2018-10-04 03:03:59 +09:00
parent 62a51a9ff1
commit 593dee202c
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
osu.Game/Rulesets/UI/RulesetInputManager.cs
View File

@ -73,12 +73,10 @@ namespace osu.Game.Rulesets.UI
#region IHasReplayHandler
private ReplayInputHandler replayInputHandler;
public ReplayInputHandler ReplayInputHandler
{
get
{
return replayInputHandler;
}
get => replayInputHandler;
set
{
if (replayInputHandler != null) RemoveHandler(replayInputHandler);
@ -220,6 +218,13 @@ namespace osu.Game.Rulesets.UI
return base.OnMouseUp(e);
}
protected override bool Handle(UIEvent e)
{
if (mouseDisabled.Value && e is MouseDownEvent me && (me.Button == MouseButton.Left || me.Button == MouseButton.Right)) return false;
return base.Handle(e);
}
#endregion
#region Key Counter Attachment
@ -269,7 +274,7 @@ namespace osu.Game.Rulesets.UI
}
public class RulesetInputManagerInputState<T> : InputState
where T : struct
where T : struct
{
public ReplayState<T> LastReplayState;