h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-15 10:02:59 +08:00
Code Issues Releases Wiki Activity

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

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
osu.Game/Graphics/UserInterface/FocusedTextBox.cs
View File

@ -3,7 +3,9 @@
using osuTK.Graphics; using osuTK.Graphics;
using System; using System;
using osu.Framework.Allocation;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Framework.Platform;
using osu.Game.Input.Bindings; using osu.Game.Input.Bindings;
using osuTK.Input; using osuTK.Input;
@ -21,9 +23,16 @@ namespace osu.Game.Graphics.UserInterface
private bool focus; private bool focus;
private bool allowImmediateFocus => host?.OnScreenKeyboardOverlapsGameWindow != true;
public void TakeFocus()
{
if (allowImmediateFocus) GetContainingInputManager().ChangeFocus(this);
}
public bool HoldFocus public bool HoldFocus
{ {
get { return focus; } get { return allowImmediateFocus && focus; }
set set
{ {
focus = value; 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 // 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; public override bool HandleNonPositionalInput => HoldFocus || base.HandleNonPositionalInput;

2
osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
View File

@ -164,7 +164,7 @@ namespace osu.Game.Overlays.Chat.Selection
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
{ {
GetContainingInputManager().ChangeFocus(search); search.TakeFocus();
base.OnFocus(e); base.OnFocus(e);
} }

2
osu.Game/Overlays/ChatOverlay.cs
View File

@ -302,7 +302,7 @@ namespace osu.Game.Overlays
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
{ {
//this is necessary as textbox is masked away and therefore can't get focus :( //this is necessary as textbox is masked away and therefore can't get focus :(
GetContainingInputManager().ChangeFocus(textbox); textbox.TakeFocus();
base.OnFocus(e); base.OnFocus(e);
} }

2
osu.Game/Overlays/Music/PlaylistOverlay.cs
View File

@ -92,7 +92,7 @@ namespace osu.Game.Overlays.Music
protected override void PopIn() protected override void PopIn()
{ {
filter.Search.HoldFocus = true; 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.ResizeTo(new Vector2(1, playlist_height), transition_duration, Easing.OutQuint);
this.FadeIn(transition_duration, Easing.OutQuint); this.FadeIn(transition_duration, Easing.OutQuint);

2
osu.Game/Overlays/SearchableList/SearchableListOverlay.cs
View File

@ -103,7 +103,7 @@ namespace osu.Game.Overlays.SearchableList
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
{ {
GetContainingInputManager().ChangeFocus(Filter.Search); Filter.Search.TakeFocus();
} }
protected override void PopIn() protected override void PopIn()

2
osu.Game/Overlays/SettingsOverlay.cs
View File

@ -179,7 +179,7 @@ namespace osu.Game.Overlays
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
{ {
GetContainingInputManager().ChangeFocus(searchTextBox); searchTextBox.TakeFocus();
base.OnFocus(e); base.OnFocus(e);
} }

2
osu.Game/Screens/Multi/Lounge/LoungeSubScreen.cs
View File

@ -98,7 +98,7 @@ namespace osu.Game.Screens.Multi.Lounge
protected override void OnFocus(FocusEvent e) protected override void OnFocus(FocusEvent e)
{ {
GetContainingInputManager().ChangeFocus(Filter.Search); Filter.Search.TakeFocus();
} }
protected override void OnEntering(Screen last) protected override void OnEntering(Screen last)