h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-05 09:42:54 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into fix-select-filter-not-absorbing-input

Browse Source
This commit is contained in:
Dean Herbert 2020-03-24 14:03:58 +09:00 committed by GitHub
commit 2a1e7a7ff0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
osu.Game/Screens/Select/FilterControl.cs
View File

@ -137,6 +137,8 @@ namespace osu.Game.Screens.Select
public void Deactivate()
{
searchTextBox.ReadOnly = true;
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)
GetContainingInputManager().ChangeFocus(searchTextBox);
@ -144,6 +146,7 @@ namespace osu.Game.Screens.Select
public void Activate()
{
searchTextBox.ReadOnly = false;
searchTextBox.HoldFocus = true;
}

1
osu.Game/Screens/Select/PlaySongSelect.cs
View File

@ -56,6 +56,7 @@ namespace osu.Game.Screens.Select
switch (e.Key)
{
case Key.Enter:
case Key.KeypadEnter:
// this is a special hard-coded case; we can't rely on OnPressed (of SongSelect) as GlobalActionContainer is
// matching with exact modifier consideration (so Ctrl+Enter would be ignored).
FinaliseSelection();