1
0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 06:29:54 +08:00

Merge branch 'master' into basic-replay-recorder

This commit is contained in:
Dean Herbert
2020-03-24 16:26:13 +09:00
committed by GitHub
Unverified
3 changed files with 5 additions and 1 deletions
+3
View File
@@ -136,6 +136,8 @@ namespace osu.Game.Screens.Select
public void Deactivate()
{
searchTextBox.ReadOnly = true;
searchTextBox.HoldFocus = false;
if (searchTextBox.HasFocus)
GetContainingInputManager().ChangeFocus(searchTextBox);
@@ -143,6 +145,7 @@ namespace osu.Game.Screens.Select
public void Activate()
{
searchTextBox.ReadOnly = false;
searchTextBox.HoldFocus = true;
}
@@ -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();
+1 -1
View File
@@ -24,7 +24,7 @@
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" />
<PackageReference Include="ppy.osu.Game.Resources" Version="2020.315.0" />
<PackageReference Include="ppy.osu.Framework" Version="2020.319.0" />
<PackageReference Include="Sentry" Version="2.1.0" />
<PackageReference Include="Sentry" Version="2.1.1" />
<PackageReference Include="SharpCompress" Version="0.24.0" />
<PackageReference Include="NUnit" Version="3.12.0" />
<PackageReference Include="System.ComponentModel.Annotations" Version="4.7.0" />