RepoMirrors
/
osu
mirror of https://github.com/ppy/osu
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix slider bar regression when using arrows

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

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

@ -49,7 +49,7 @@ public FilterCriteria CreateCriteria()
return criteria;
}
private readonly SongSelectTextBox searchTextBox;
private readonly FixedSearchTextBox searchTextBox;
public override bool ReceivePositionalInputAt(Vector2 screenSpacePos) =>
base.ReceivePositionalInputAt(screenSpacePos) || groupTabs.ReceivePositionalInputAt(screenSpacePos) || sortTabs.ReceivePositionalInputAt(screenSpacePos);
@ -73,7 +73,7 @@ public FilterControl()
Origin = Anchor.TopRight,
Children = new Drawable[]
{
searchTextBox = new SongSelectTextBox { RelativeSizeAxes = Axes.X },
searchTextBox = new FixedSearchTextBox { RelativeSizeAxes = Axes.X },
new Box
{
RelativeSizeAxes = Axes.X,
@ -170,10 +170,5 @@ private void load(OsuColour colours, IBindable<RulesetInfo> parentRuleset, OsuCo
}
private void updateCriteria() => FilterChanged?.Invoke(CreateCriteria());
private class SongSelectTextBox : SearchTextBox
{
public override bool HandleLeftRightArrows => false;
}
}
}