h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-01-28 04:42:58 +08:00
Code Issues Releases Wiki Activity

Fix slider bar regression when using arrows

Browse Source
This commit is contained in:
Joehu 2019-10-17 13:54:36 -07:00
parent 649951198e
commit e5b50b5e1f
3 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
osu.Game/Graphics/UserInterface/FixedSearchTextBox.cs Normal file
View File

@ -0,0 +1,10 @@
// 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
{
public class FixedSearchTextBox : 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; protected SettingsSectionsContainer SectionsContainer;
private SearchTextBox searchTextBox; private FixedSearchTextBox searchTextBox;
/// <summary> /// <summary>
/// Provide a source for the toolbar height. /// Provide a source for the toolbar height.
@ -80,7 +80,7 @@ namespace osu.Game.Overlays
Masking = true, Masking = true,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
ExpandableHeader = CreateHeader(), ExpandableHeader = CreateHeader(),
FixedHeader = searchTextBox = new SearchTextBox FixedHeader = searchTextBox = new FixedSearchTextBox
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Origin = Anchor.TopCentre, Origin = Anchor.TopCentre,

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

@ -49,7 +49,7 @@ namespace osu.Game.Screens.Select
return criteria; return criteria;
} }
private readonly SongSelectTextBox searchTextBox; private readonly FixedSearchTextBox searchTextBox;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) => public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos); base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
@ -73,7 +73,7 @@ namespace osu.Game.Screens.Select
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Children = new Drawable[] Children = new Drawable[]
{ {
searchTextBox = new SongSelectTextBox { RelativeSizeAxes = Axes.X }, searchTextBox = new FixedSearchTextBox { RelativeSizeAxes = Axes.X },
new Box new Box
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
@ -170,10 +170,5 @@ namespace osu.Game.Screens.Select
} }
private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria()); private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
private class SongSelectTextBox : SearchTextBox
{
public override bool HandleLeftRightArrows => false;
}
} }
} }