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

Fix incorrect shear masking on nested textbox

Browse Source
This commit is contained in:
Dean Herbert 2022-05-03 14:45:17 +09:00
parent bc88c4ee8e
commit b5ea26f2fa
1 changed files with 7 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
osu.Game/Graphics/UserInterface/ShearedSearchTextBox.cs
View File

@ -21,7 +21,6 @@ namespace osu.Game.Graphics.UserInterface
private const float corner_radius = 7; private const float corner_radius = 7;
private readonly Box background; private readonly Box background;
private readonly Box searchBoxBackground;
private readonly SearchTextBox textBox; private readonly SearchTextBox textBox;
public Bindable<string> Current public Bindable<string> Current
@ -60,30 +59,12 @@ namespace osu.Game.Graphics.UserInterface
{ {
new Drawable[] new Drawable[]
{ {
new Container textBox = new InnerSearchTextBox
{ {
Name = @"Search box container", Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Both,
CornerRadius = corner_radius, Size = Vector2.One
Masking = true,
Children = new Drawable[]
{
searchBoxBackground = new Box
{
RelativeSizeAxes = Axes.Both
},
textBox = new InnerSearchTextBox
{
Shear = -Shear,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
RelativeSizeAxes = Axes.X,
Padding = new MarginPadding
{
Horizontal = corner_radius + Shear.X
}
}
}
}, },
new Container new Container
{ {
@ -119,7 +100,6 @@ namespace osu.Game.Graphics.UserInterface
private void load(OverlayColourProvider colourProvider) private void load(OverlayColourProvider colourProvider)
{ {
background.Colour = colourProvider.Background3; background.Colour = colourProvider.Background3;
searchBoxBackground.Colour = colourProvider.Background4;
} }
public override bool HandleNonPositionalInput => textBox.HandleNonPositionalInput; public override bool HandleNonPositionalInput => textBox.HandleNonPositionalInput;
@ -134,6 +114,9 @@ namespace osu.Game.Graphics.UserInterface
Placeholder.Font = OsuFont.GetFont(size: CalculatedTextSize, weight: FontWeight.SemiBold); Placeholder.Font = OsuFont.GetFont(size: CalculatedTextSize, weight: FontWeight.SemiBold);
PlaceholderText = CommonStrings.InputSearch; PlaceholderText = CommonStrings.InputSearch;
CornerRadius = corner_radius;
TextContainer.Shear = new Vector2(-ShearedOverlayContainer.SHEAR, 0);
} }
protected override SpriteText CreatePlaceholder() => new SearchPlaceholder(); protected override SpriteText CreatePlaceholder() => new SearchPlaceholder();