sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-05-30 01:47:30 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #18063 from GSculerlor/split-searchbox

Browse Source 
Split `SearchTextBox` implementation for reusability
This commit is contained in:
Dean Herbert 2022-05-03 14:12:44 +09:00 committed by GitHub
commit 04fb0f5e63
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 31 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
osu.Game/Graphics/UserInterface/BasicSearchTextBox.cs Normal file
View File

@ -0,0 +1,26 @@
// 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.
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osuTK;
namespace osu.Game.Graphics.UserInterface
{
public class BasicSearchTextBox : SearchTextBox
{
public BasicSearchTextBox()
{
Add(new SpriteIcon
{
Icon = FontAwesome.Solid.Search,
Origin = Anchor.CentreRight,
Anchor = Anchor.CentreRight,
Margin = new MarginPadding { Right = 10 },
Size = new Vector2(20),
});
TextFlow.Padding = new MarginPadding { Right = 35 };
}
}
}

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

@ -1,12 +1,9 @@
// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence. // 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. // See the LICENCE file in the repository root for full licence text.
using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input; using osu.Framework.Input;
using osu.Framework.Input.Events; using osu.Framework.Input.Events;
using osu.Game.Resources.Localisation.Web; using osu.Game.Resources.Localisation.Web;
using osuTK;
using osuTK.Input; using osuTK.Input;
namespace osu.Game.Graphics.UserInterface namespace osu.Game.Graphics.UserInterface
@ -18,16 +15,6 @@ namespace osu.Game.Graphics.UserInterface
public SearchTextBox() public SearchTextBox()
{ {
Height = 35; Height = 35;
Add(new SpriteIcon
{
Icon = FontAwesome.Solid.Search,
Origin = Anchor.CentreRight,
Anchor = Anchor.CentreRight,
Margin = new MarginPadding { Right = 10 },
Size = new Vector2(20),
});
TextFlow.Padding = new MarginPadding { Right = 35 };
PlaceholderText = HomeStrings.SearchPlaceholder; PlaceholderText = HomeStrings.SearchPlaceholder;
} }

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

@ -6,7 +6,7 @@ namespace osu.Game.Graphics.UserInterface
/// <summary> /// <summary>
/// A <see cref="SearchTextBox"/> which does not handle left/right arrow keys for seeking. /// A <see cref="SearchTextBox"/> which does not handle left/right arrow keys for seeking.
/// </summary> /// </summary>
public class SeekLimitedSearchTextBox : SearchTextBox public class SeekLimitedSearchTextBox : BasicSearchTextBox
{ {
public override bool HandleLeftRightArrows => false; public override bool HandleLeftRightArrows => false;
} }

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

@ -163,7 +163,7 @@ namespace osu.Game.Overlays.BeatmapListing
public void TakeFocus() => textBox.TakeFocus(); public void TakeFocus() => textBox.TakeFocus();
private class BeatmapSearchTextBox : SearchTextBox private class BeatmapSearchTextBox : BasicSearchTextBox
{ {
/// <summary> /// <summary>
/// Any time the text box receives key events (even while masked). /// Any time the text box receives key events (even while masked).

2
osu.Game/Overlays/Chat/Selection/ChannelSelectionOverlay.cs
View File

@ -181,7 +181,7 @@ namespace osu.Game.Overlays.Chat.Selection
base.PopOut(); base.PopOut();
} }
private class HeaderSearchTextBox : SearchTextBox private class HeaderSearchTextBox : BasicSearchTextBox
{ {
[BackgroundDependencyLoader] [BackgroundDependencyLoader]
private void load() private void load()

2
osu.Game/Overlays/Music/FilterControl.cs
View File

@ -56,7 +56,7 @@ namespace osu.Game.Overlays.Music
Collection = collectionDropdown.Current.Value?.Collection Collection = collectionDropdown.Current.Value?.Collection
}; };
public class FilterTextBox : SearchTextBox public class FilterTextBox : BasicSearchTextBox
{ {
protected override bool AllowCommit => true; protected override bool AllowCommit => true;

2
osu.Game/Screens/OnlinePlay/Lounge/LoungeSubScreen.cs
View File

@ -129,7 +129,7 @@ namespace osu.Game.Screens.OnlinePlay.Lounge
{ {
RelativeSizeAxes = Axes.X, RelativeSizeAxes = Axes.X,
Height = Header.HEIGHT, Height = Header.HEIGHT,
Child = searchTextBox = new SearchTextBox Child = searchTextBox = new BasicSearchTextBox
{ {
Anchor = Anchor.CentreRight, Anchor = Anchor.CentreRight,
Origin = Anchor.CentreRight, Origin = Anchor.CentreRight,