h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2025-02-06 04:12:55 +08:00
Code Issues Releases Wiki Activity

Merge pull request #19538 from bdach/mod-overlay/sheared-button-broken-autosize

Browse Source 
Fix broken sheared button autosizing logic
This commit is contained in:
Dean Herbert 2022-08-02 11:51:14 +09:00 committed by GitHub
commit 5501195ed7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
osu.Game.Tests/Visual/UserInterface/TestSceneShearedButtons.cs
View File

@ -3,9 +3,13 @@
#nullable disable #nullable disable
using System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Allocation; using osu.Framework.Allocation;
using osu.Framework.Graphics; using osu.Framework.Graphics;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Testing;
using osu.Framework.Utils;
using osu.Game.Graphics.UserInterface; using osu.Game.Graphics.UserInterface;
using osu.Game.Overlays; using osu.Game.Overlays;
using osuTK.Input; using osuTK.Input;
@ -99,7 +103,10 @@ namespace osu.Game.Tests.Visual.UserInterface
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = "Fixed width" Text = "Fixed width"
}); });
AddAssert("draw width is 200", () => toggleButton.DrawWidth, () => Is.EqualTo(200).Within(Precision.FLOAT_EPSILON));
AddStep("change text", () => toggleButton.Text = "New text"); AddStep("change text", () => toggleButton.Text = "New text");
AddAssert("draw width is 200", () => toggleButton.DrawWidth, () => Is.EqualTo(200).Within(Precision.FLOAT_EPSILON));
AddStep("create auto-sizing button", () => Child = toggleButton = new ShearedToggleButton AddStep("create auto-sizing button", () => Child = toggleButton = new ShearedToggleButton
{ {
@ -107,7 +114,14 @@ namespace osu.Game.Tests.Visual.UserInterface
Origin = Anchor.Centre, Origin = Anchor.Centre,
Text = "This button autosizes to its text!" Text = "This button autosizes to its text!"
}); });
AddAssert("button is wider than text", () => toggleButton.DrawWidth, () => Is.GreaterThan(toggleButton.ChildrenOfType<SpriteText>().Single().DrawWidth));
float originalDrawWidth = 0;
AddStep("store button width", () => originalDrawWidth = toggleButton.DrawWidth);
AddStep("change text", () => toggleButton.Text = "New text"); AddStep("change text", () => toggleButton.Text = "New text");
AddAssert("button is wider than text", () => toggleButton.DrawWidth, () => Is.GreaterThan(toggleButton.ChildrenOfType<SpriteText>().Single().DrawWidth));
AddAssert("button width decreased", () => toggleButton.DrawWidth, () => Is.LessThan(originalDrawWidth));
} }
[Test] [Test]

4
osu.Game/Graphics/UserInterface/ShearedButton.cs
View File

@ -97,7 +97,7 @@ namespace osu.Game.Graphics.UserInterface
{ {
backgroundLayer = new Container backgroundLayer = new Container
{ {
RelativeSizeAxes = Axes.Both, RelativeSizeAxes = Axes.Y,
CornerRadius = corner_radius, CornerRadius = corner_radius,
Masking = true, Masking = true,
BorderThickness = 2, BorderThickness = 2,
@ -128,10 +128,12 @@ namespace osu.Game.Graphics.UserInterface
if (width != null) if (width != null)
{ {
Width = width.Value; Width = width.Value;
backgroundLayer.RelativeSizeAxes = Axes.Both;
} }
else else
{ {
AutoSizeAxes = Axes.X; AutoSizeAxes = Axes.X;
backgroundLayer.AutoSizeAxes = Axes.X;
text.Margin = new MarginPadding { Horizontal = 15 }; text.Margin = new MarginPadding { Horizontal = 15 };
} }
} }