RepoMirrors/osu
1
0
Fork 0
mirror of https://github.com/ppy/osu synced 2025-01-10 08:09:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

Proper search field focusing and exit on escape

Browse Source
This commit is contained in:
DrabWeb 2017-04-09 06:26:17 -03:00
parent a88c82705b
commit 7f2feab9e7
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osu.Game/Overlays/PlaylistController.cs
View File

@ -20,7 +20,7 @@ using osu.Game.Screens.Select;
namespace osu.Game.Overlays
{
public class PlaylistController : FocusedOverlayContainer
public class PlaylistController : OverlayContainer
{
private const float transition_duration = 800;
@ -83,6 +83,8 @@ namespace osu.Game.Overlays
},
},
};
filter.Search.Exit = Hide;
}
[BackgroundDependencyLoader]
@ -94,9 +96,8 @@ namespace osu.Game.Overlays
protected override void PopIn()
{
base.PopIn();
filter.Search.HoldFocus = true;
filter.Search.TriggerFocus();
list.ScrollContainer.ScrollDraggerVisible = true;
ResizeTo(new Vector2(1f), transition_duration, EasingTypes.OutQuint);
@ -104,8 +105,6 @@ namespace osu.Game.Overlays
protected override void PopOut()
{
base.PopOut();
filter.Search.HoldFocus = false;
filter.Search.TriggerFocusLost();
@ -143,7 +142,7 @@ namespace osu.Game.Overlays
};
}
public class FilterTextBox : SearchTextBox
public class FilterTextBox : SearchTextBox
{
protected override Color4 BackgroundUnfocused => OsuColour.FromHex(@"222222");
protected override Color4 BackgroundFocused => OsuColour.FromHex(@"222222");
@ -152,7 +151,7 @@ namespace osu.Game.Overlays
{
Masking = true;
CornerRadius = 5;
}
}
}
private class CollectionsDropdown<T> : OsuDropdown<T>
@ -234,8 +233,8 @@ namespace osu.Game.Overlays
for (int i = 0; i < value.Length; i++)
{
newItems.Add(new PlaylistItem(value[i], i)
{
newItems.Add(new PlaylistItem(value[i], i)
{
OnSelect = OnSelect,
});
}