mirror of
https://github.com/ppy/osu
synced 2025-02-27 16:11:43 +00:00
Merge branch 'master' into fix-osu-logo
This commit is contained in:
commit
7ce9a915b7
@ -10,6 +10,7 @@ using osu.Framework.Extensions.IEnumerableExtensions;
|
||||
using osu.Framework.Graphics;
|
||||
using osu.Framework.Graphics.Containers;
|
||||
using osu.Framework.MathUtils;
|
||||
using osu.Framework.Platform;
|
||||
using osu.Framework.Screens;
|
||||
using osu.Game.Graphics;
|
||||
using osu.Game.Graphics.Containers;
|
||||
@ -38,11 +39,13 @@ namespace osu.Game.Overlays.AccountCreation
|
||||
|
||||
private OsuTextBox[] textboxes;
|
||||
private ProcessingOverlay processingOverlay;
|
||||
private GameHost host;
|
||||
|
||||
[BackgroundDependencyLoader]
|
||||
private void load(OsuColour colours, APIAccess api)
|
||||
private void load(OsuColour colours, APIAccess api, GameHost host)
|
||||
{
|
||||
this.api = api;
|
||||
this.host = host;
|
||||
|
||||
InternalChildren = new Drawable[]
|
||||
{
|
||||
@ -139,7 +142,7 @@ namespace osu.Game.Overlays.AccountCreation
|
||||
{
|
||||
base.Update();
|
||||
|
||||
if (!textboxes.Any(t => t.HasFocus))
|
||||
if (host?.OnScreenKeyboardOverlapsGameWindow != true && !textboxes.Any(t => t.HasFocus))
|
||||
focusNextTextbox();
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user