Merge branch 'master' into mod_application

This commit is contained in:
Dan Balasescu
2017-03-14 12:38:55 +09:00
committed by GitHub
33 changed files with 88 additions and 246 deletions

View File

@ -70,14 +70,14 @@ namespace osu.Game.Screens.Play
{
if (mouseDisabled.Value)
{
mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = false;
mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = false;
mouse.PressedButtons.Remove(MouseButton.Left);
mouse.PressedButtons.Remove(MouseButton.Right);
}
if (leftViaKeyboard)
mouse.ButtonStates.Find(s => s.Button == MouseButton.Left).State = true;
mouse.PressedButtons.Add(MouseButton.Left);
if (rightViaKeyboard)
mouse.ButtonStates.Find(s => s.Button == MouseButton.Right).State = true;
mouse.PressedButtons.Add(MouseButton.Right);
}
}