Merge branch 'master' into osu-fontusage

This commit is contained in:
Dean Herbert
2019-02-22 18:09:23 +09:00
committed by GitHub
286 changed files with 837 additions and 876 deletions

View File

@ -175,7 +175,7 @@ namespace osu.Game.Screens.Play
}
};
button.Selected.ValueChanged += s => buttonSelectionChanged(button, s);
button.Selected.ValueChanged += selected => buttonSelectionChanged(button, selected.NewValue);
InternalButtons.Add(button);
}
@ -290,7 +290,7 @@ namespace osu.Game.Screens.Play
protected override bool OnKeyDown(KeyDownEvent e)
{
if (e.Repeat || e.Key != Key.Enter || !Selected)
if (e.Repeat || e.Key != Key.Enter || !Selected.Value)
return false;
Click();