Don't auto-focus textboxes when on screen keyboard would cause inconvenience

This commit is contained in:
Dean Herbert
2019-01-25 19:20:08 +09:00
parent 82d944dc89
commit 260034a80e
7 changed files with 24 additions and 7 deletions

View File

@ -3,7 +3,9 @@
using osuTK.Graphics;
using System;
using osu.Framework.Allocation;
using osu.Framework.Input.Events;
using osu.Framework.Platform;
using osu.Game.Input.Bindings;
using osuTK.Input;
@ -21,9 +23,16 @@ namespace osu.Game.Graphics.UserInterface
private bool focus;
private bool allowImmediateFocus => host?.OnScreenKeyboardOverlapsGameWindow != true;
public void TakeFocus()
{
if (allowImmediateFocus) GetContainingInputManager().ChangeFocus(this);
}
public bool HoldFocus
{
get { return focus; }
get { return allowImmediateFocus && focus; }
set
{
focus = value;
@ -32,6 +41,14 @@ namespace osu.Game.Graphics.UserInterface
}
}
private GameHost host;
[BackgroundDependencyLoader]
private void load(GameHost host)
{
this.host = host;
}
// We may not be focused yet, but we need to handle keyboard input to be able to request focus
public override bool HandleNonPositionalInput => HoldFocus || base.HandleNonPositionalInput;