sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 00:09:55 +09:00
Code Issues Packages Projects 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
parent 5bc5119389 f676052528
commit 2a1e7a7ff0
2 changed files with 4 additions and 0 deletions
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() public void Deactivate()
{ {
searchTextBox.ReadOnly = true;
searchTextBox.HoldFocus = false; searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus) if (searchTextBox.HasFocus)
GetContainingInputManager().ChangeFocus(searchTextBox); GetContainingInputManager().ChangeFocus(searchTextBox);
@ -144,6 +146,7 @@ namespace osu.Game.Screens.Select
public void Activate() public void Activate()
{ {
searchTextBox.ReadOnly = false;
searchTextBox.HoldFocus = true; searchTextBox.HoldFocus = true;
} }

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

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