h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-03-28 09:37:23 +08:00
Code Issues Releases Wiki Activity

Merge pull request #8820 from peppy/fix-beatmap-listing-focus

Browse Source 
Fix BeatmapListingOverlay not taking focus
This commit is contained in:
Dan Balasescu 2020-04-21 20:27:28 +09:00 committed by GitHub
commit 5f60071541
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Overlays/BeatmapListing/BeatmapListingFilterControl.cs
View File

@ -159,5 +159,7 @@ namespace osu.Game.Overlays.BeatmapListing
base.Dispose(isDisposing); base.Dispose(isDisposing);
} }
public void TakeFocus() => searchControl.TakeFocus();
} }
} }

2
osu.Game/Overlays/BeatmapListing/BeatmapListingSearchControl.cs
View File

@ -121,6 +121,8 @@ namespace osu.Game.Overlays.BeatmapListing
background.Colour = colourProvider.Dark6; background.Colour = colourProvider.Dark6;
} }
public void TakeFocus() => textBox.TakeFocus();
private class BeatmapSearchTextBox : SearchTextBox private class BeatmapSearchTextBox : SearchTextBox
{ {
protected override Color4 SelectionColour => Color4.Gray; protected override Color4 SelectionColour => Color4.Gray;

12
osu.Game/Overlays/BeatmapListingOverlay.cs
View File

@ -10,6 +10,7 @@ using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes; using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites; using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.Textures; using osu.Framework.Graphics.Textures;
using osu.Framework.Input.Events;
using osu.Game.Audio; using osu.Game.Audio;
using osu.Game.Beatmaps; using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers; using osu.Game.Graphics.Containers;
@ -35,6 +36,8 @@ namespace osu.Game.Overlays
{ {
} }
private BeatmapListingFilterControl filterControl;
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()
{ {
@ -57,7 +60,7 @@ namespace osu.Game.Overlays
Children = new Drawable[] Children = new Drawable[]
{ {
new BeatmapListingHeader(), new BeatmapListingHeader(),
new BeatmapListingFilterControl filterControl = new BeatmapListingFilterControl
{ {
SearchStarted = onSearchStarted, SearchStarted = onSearchStarted,
SearchFinished = onSearchFinished, SearchFinished = onSearchFinished,
@ -88,6 +91,13 @@ namespace osu.Game.Overlays
}; };
} }
protected override void OnFocus(FocusEvent e)
{
base.OnFocus(e);
filterControl.TakeFocus();
}
private CancellationTokenSource cancellationToken; private CancellationTokenSource cancellationToken;
private void onSearchStarted() private void onSearchStarted()