Merge branch 'master' into multiplayer-chat

This commit is contained in:
Dan Balasescu
2021-08-20 11:54:42 +09:00
committed by GitHub
73 changed files with 2079 additions and 1966 deletions

View File

@ -22,7 +22,10 @@ namespace osu.Game.Graphics.UserInterface
public void TakeFocus()
{
if (allowImmediateFocus) GetContainingInputManager().ChangeFocus(this);
if (!allowImmediateFocus)
return;
Scheduler.Add(() => GetContainingInputManager().ChangeFocus(this), false);
}
public new void KillFocus() => base.KillFocus();