From b9d0fc927b54a3bb801dc8a600a3ce443b85c61a Mon Sep 17 00:00:00 2001 From: ekrctb Date: Thu, 4 Oct 2018 17:55:31 +0900 Subject: [PATCH] Remove duplicated code --- osu.Game/Rulesets/UI/RulesetInputManager.cs | 25 +++++++++------------ 1 file changed, 11 insertions(+), 14 deletions(-) diff --git a/osu.Game/Rulesets/UI/RulesetInputManager.cs b/osu.Game/Rulesets/UI/RulesetInputManager.cs index 64bbb8b52b..340833c090 100644 --- a/osu.Game/Rulesets/UI/RulesetInputManager.cs +++ b/osu.Game/Rulesets/UI/RulesetInputManager.cs @@ -206,22 +206,19 @@ namespace osu.Game.Rulesets.UI mouseDisabled = config.GetBindable(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); }