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

Merge branch 'master' into beatmap-refactor/remove-online-info

Browse Source
This commit is contained in:
Dan Balasescu 2021-11-05 12:46:02 +09:00 committed by GitHub
commit acb06d4a99
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
osu.Game.Tests/Visual/UserInterface/TestSceneLabelledDrawable.cs
View File

@ -1,6 +1,7 @@
// 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 System.Linq;
using NUnit.Framework; using NUnit.Framework;
using osu.Framework.Extensions.IEnumerableExtensions; using osu.Framework.Extensions.IEnumerableExtensions;
using osu.Framework.Graphics; using osu.Framework.Graphics;
@ -65,10 +66,10 @@ namespace osu.Game.Tests.Visual.UserInterface
private void createPaddedComponent(bool hasDescription = false, bool padded = true) private void createPaddedComponent(bool hasDescription = false, bool padded = true)
{ {
LabelledDrawable<Drawable> component = null;
AddStep("create component", () => AddStep("create component", () =>
{ {
LabelledDrawable<Drawable> component;
Child = new Container Child = new Container
{ {
Anchor = Anchor.Centre, Anchor = Anchor.Centre,
@ -81,6 +82,8 @@ namespace osu.Game.Tests.Visual.UserInterface
component.Label = "a sample component"; component.Label = "a sample component";
component.Description = hasDescription ? "this text describes the component" : string.Empty; component.Description = hasDescription ? "this text describes the component" : string.Empty;
}); });
AddAssert($"description {(hasDescription ? "visible" : "hidden")}", () => component.ChildrenOfType<TextFlowContainer>().ElementAt(1).IsPresent == hasDescription);
} }
private class PaddedLabelledDrawable : LabelledDrawable<Drawable> private class PaddedLabelledDrawable : LabelledDrawable<Drawable>

2
osu.Game/Graphics/UserInterfaceV2/LabelledDrawable.cs
View File

@ -168,7 +168,7 @@ namespace osu.Game.Graphics.UserInterfaceV2
{ {
descriptionText.Text = value; descriptionText.Text = value;
if (value == default) if (!string.IsNullOrEmpty(value.ToString()))
descriptionText.Show(); descriptionText.Show();
else else
descriptionText.Hide(); descriptionText.Hide();