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

Merge branch 'master' into chat-day-separator

Browse Source
This commit is contained in:
Dean Herbert 2019-10-22 15:48:42 +09:00 committed by GitHub
commit 7084aa7b81
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
osu.Game/Graphics/UserInterface/SearchTextBox.cs
View File

@ -14,8 +14,6 @@ namespace osu.Game.Graphics.UserInterface
{
protected virtual bool AllowCommit => false;
public override bool HandleLeftRightArrows => false;
public SearchTextBox()
{
Height = 35;

13
osu.Game/Graphics/UserInterface/SeekLimitedSearchTextBox.cs Normal file
View File

@ -0,0 +1,13 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
// See the LICENCE file in the repository root for full licence text.
namespace osu.Game.Graphics.UserInterface
{
/// <summary>
/// A <see cref="SearchTextBox"/> which does not handle left/right arrow keys for seeking.
/// </summary>
public class SeekLimitedSearchTextBox : SearchTextBox
{
public override bool HandleLeftRightArrows => false;
}
}

4
osu.Game/Overlays/SettingsPanel.cs
View File

@ -37,7 +37,7 @@ namespace osu.Game.Overlays
protected SettingsSectionsContainer SectionsContainer;
private SearchTextBox searchTextBox;
private SeekLimitedSearchTextBox searchTextBox;
/// <summary>
/// Provide a source for the toolbar height.
@ -80,7 +80,7 @@ namespace osu.Game.Overlays
Masking = true,
RelativeSizeAxes = Axes.Both,
ExpandableHeader = CreateHeader(),
FixedHeader = searchTextBox = new SearchTextBox
FixedHeader = searchTextBox = new SeekLimitedSearchTextBox
{
RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre,

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

@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select
return criteria;
}
private readonly SearchTextBox searchTextBox;
private readonly SeekLimitedSearchTextBox searchTextBox;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
@ -73,7 +73,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.TopRight,
Children = new Drawable[]
{
searchTextBox = new SearchTextBox { RelativeSizeAxes = Axes.X },
searchTextBox = new SeekLimitedSearchTextBox { RelativeSizeAxes = Axes.X },
new Box
{
RelativeSizeAxes = Axes.X,