1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-28 14:30:42 +08:00

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
Unverified
parent 82d944dc89
commit 260034a80e
7 changed files with 24 additions and 7 deletions
@@ -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;
@@ -164,7 +164,7 @@ namespace osu.Game.Overlays.Chat.Selection
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(search);
search.TakeFocus();
base.OnFocus(e);
}
+1 -1
View File
@@ -302,7 +302,7 @@ namespace osu.Game.Overlays
protected override void OnFocus(FocusEvent e)
{
//this is necessary as textbox is masked away and therefore can't get focus :(
GetContainingInputManager().ChangeFocus(textbox);
textbox.TakeFocus();
base.OnFocus(e);
}
+1 -1
View File
@@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Music
protected override void PopIn()
{
filter.Search.HoldFocus = true;
Schedule(() => GetContainingInputManager().ChangeFocus(filter.Search));
Schedule(() => filter.Search.TakeFocus());
this.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint);
this.FadeIn(transition_duration, Easing.OutQuint);
@@ -103,7 +103,7 @@ namespace osu.Game.Overlays.SearchableList
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(Filter.Search);
Filter.Search.TakeFocus();
}
protected override void PopIn()
+1 -1
View File
@@ -179,7 +179,7 @@ namespace osu.Game.Overlays
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(searchTextBox);
searchTextBox.TakeFocus();
base.OnFocus(e);
}
@@ -98,7 +98,7 @@ namespace osu.Game.Screens.Multi.Lounge
protected override void OnFocus(FocusEvent e)
{
GetContainingInputManager().ChangeFocus(Filter.Search);
Filter.Search.TakeFocus();
}
protected override void OnEntering(Screen last)