Merge https://github.com/ppy/osu into channel-selection

This commit is contained in:
DrabWeb
2017-05-31 22:32:05 -03:00
17 changed files with 170 additions and 96 deletions

View File

@ -201,11 +201,15 @@ namespace osu.Game.Overlays
}
}
protected override bool OnFocus(InputState state)
public override bool AcceptsFocus => true;
protected override bool OnClick(InputState state) => true;
protected override void OnFocus(InputState state)
{
//this is necessary as inputTextBox is masked away and therefore can't get focus :(
InputManager.ChangeFocus(inputTextBox);
return false;
base.OnFocus(state);
}
protected override void PopIn()