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

Merge branch 'master' into exit-multiplayer-is-dangerous

Browse Source
This commit is contained in:
Dean Herbert
2022-05-06 14:25:18 +09:00
parent 2896612c5c 35e307672b
commit 0d8e42b941
69 changed files with 2025 additions and 330 deletions
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.
// 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.Events;
using osu.Game.Resources.Localisation.Web;
using osuTK;
using osuTK.Input;
namespace osu.Game.Graphics.UserInterface
@ -18,16 +15,6 @@ namespace osu.Game.Graphics.UserInterface
public SearchTextBox()
{
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;
}

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

@ -6,7 +6,7 @@ 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 class SeekLimitedSearchTextBox : BasicSearchTextBox
{
public override bool HandleLeftRightArrows => false;
}

137
osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs Normal file
View File

@ -0,0 +1,137 @@
// 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.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Graphics.UserInterface;
using osu.Game.Graphics.Sprites;
using osu.Game.Overlays;
using osu.Game.Overlays.Mods;
using osu.Game.Resources.Localisation.Web;
using osuTK;
namespace osu.Game.Graphics.UserInterface
{
public class ShearedSearchTextBox : CompositeDrawable, IHasCurrentValue<string>
{
private const float corner_radius = 7;
private readonly Box background;
private readonly SearchTextBox textBox;
public Bindable<string> Current
{
get => textBox.Current;
set => textBox.Current = value;
}
public bool HoldFocus
{
get => textBox.HoldFocus;
set => textBox.HoldFocus = value;
}
public void TakeFocus() => textBox.TakeFocus();
public void KillFocus() => textBox.KillFocus();
public ShearedSearchTextBox()
{
Height = 42;
Shear = new Vector2(ShearedOverlayContainer.SHEAR, 0);
Masking = true;
CornerRadius = corner_radius;
InternalChildren = new Drawable[]
{
background = new Box
{
RelativeSizeAxes = Axes.Both
},
new GridContainer
{
RelativeSizeAxes = Axes.Both,
Content = new[]
{
new Drawable[]
{
textBox = new InnerSearchTextBox
{
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.Both,
Size = Vector2.One
},
new SpriteIcon
{
Icon = FontAwesome.Solid.Search,
Origin = Anchor.Centre,
Anchor = Anchor.Centre,
Size = new Vector2(16),
Shear = -Shear
}
}
},
ColumnDimensions = new[]
{
new Dimension(),
new Dimension(GridSizeMode.Absolute, 50),
}
}
};
}
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
background.Colour = colourProvider.Background3;
}
public override bool HandleNonPositionalInput => textBox.HandleNonPositionalInput;
private class InnerSearchTextBox : SearchTextBox
{
[BackgroundDependencyLoader]
private void load(OverlayColourProvider colourProvider)
{
BackgroundFocused = colourProvider.Background4;
BackgroundUnfocused = colourProvider.Background4;
Placeholder.Font = OsuFont.GetFont(size: CalculatedTextSize, weight: FontWeight.SemiBold);
PlaceholderText = CommonStrings.InputSearch;
CornerRadius = corner_radius;
TextContainer.Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
}
protected override SpriteText CreatePlaceholder() => new SearchPlaceholder();
internal class SearchPlaceholder : SpriteText
{
public override void Show()
{
this
.MoveToY(0, 250, Easing.OutQuint)
.FadeIn(250, Easing.OutQuint);
}
public override void Hide()
{
this
.MoveToY(3, 250, Easing.OutQuint)
.FadeOut(250, Easing.OutQuint);
}
}
protected override Drawable GetDrawableCharacter(char c) => new FallingDownContainer
{
AutoSizeAxes = Axes.Both,
Child = new OsuSpriteText { Text = c.ToString(), Font = OsuFont.GetFont(size: 20, weight: FontWeight.SemiBold) },
};
}
}
}