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

Merge pull request #3536 from ekrctb/3533-followup

Browse Source 
Remove duplicated code
This commit is contained in:
Dean Herbert 2018-10-04 18:28:16 +09:00 committed by GitHub
commit a4c4622070
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 11 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -206,22 +206,19 @@ namespace osu.Game.Rulesets.UI
mouseDisabled = config.GetBindable<bool>(OsuSetting.MouseDisableButtons);
}
protected override bool OnMouseDown(MouseDownEvent e)
{
if (mouseDisabled.Value && (e.Button == MouseButton.Left || e.Button == MouseButton.Right)) return false;
return base.OnMouseDown(e);
}
protected override bool OnMouseUp(MouseUpEvent e)
{
if (!CurrentState.Mouse.IsPressed(e.Button)) return false;
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;
switch (e)
{
case MouseDownEvent mouseDown when mouseDown.Button == MouseButton.Left || mouseDown.Button == MouseButton.Right:
if (mouseDisabled.Value)
return false;
break;
case MouseUpEvent mouseUp:
if (!CurrentState.Mouse.IsPressed(mouseUp.Button))
return false;
break;
}
return base.Handle(e);
}