h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-11-11 11:37:28 +08:00
Code Issues Releases Wiki Activity

Implement song select v2 difficulty name content component

Browse Source
This commit is contained in:
Joseph Madamba 2024-08-12 19:52:42 -07:00
parent 46d41cb590
commit 625c6fc7eb
2 changed files with 195 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

97
osu.Game.Tests/Visual/SongSelectV2/TestSceneDifficultyNameContent.cs Normal file
View File

@ -0,0 +1,97 @@
// 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 System.Linq;
using NUnit.Framework;
using osu.Framework.Allocation;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Localisation;
using osu.Framework.Testing;
using osu.Game.Beatmaps;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
using osu.Game.Screens.SelectV2.Wedge;
namespace osu.Game.Tests.Visual.SongSelectV2
{
public partial class TestSceneDifficultyNameContent : SongSelectComponentsTestScene
{
private Container? content;
private DifficultyNameContent? difficultyNameContent;
private float relativeWidth;
[BackgroundDependencyLoader]
private void load()
{
AddSliderStep("change relative width", 0, 1f, 0.5f, v =>
{
if (content != null)
content.Width = v;
relativeWidth = v;
});
}
public override void SetUpSteps()
{
base.SetUpSteps();
AddStep("set content", () =>
{
Child = content = new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding(10),
Width = relativeWidth,
Children = new Drawable[]
{
new Box
{
RelativeSizeAxes = Axes.Both,
Colour = ColourProvider.Background5,
},
new Container
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Padding = new MarginPadding(10),
Child = difficultyNameContent = new DifficultyNameContent(),
}
}
};
});
}
[Test]
public void TestLocalBeatmap()
{
AddAssert("difficulty name is not set", () => LocalisableString.IsNullOrEmpty(difficultyNameContent.ChildrenOfType<TruncatingSpriteText>().Single().Text));
AddAssert("author is not set", () => !difficultyNameContent.ChildrenOfType<LinkFlowContainer>().Single().ChildrenOfType<OsuSpriteText>().Any());
AddStep("set beatmap", () => Beatmap.Value = CreateWorkingBeatmap(new Beatmap
{
BeatmapInfo = new BeatmapInfo
{
DifficultyName = "really long difficulty name that gets truncated",
Metadata = new BeatmapMetadata
{
Author = { Username = "really long username that is autosized" },
},
OnlineID = 1,
}
}));
AddAssert("difficulty name is set", () => !LocalisableString.IsNullOrEmpty(difficultyNameContent.ChildrenOfType<TruncatingSpriteText>().Single().Text));
AddAssert("author is set", () => difficultyNameContent.ChildrenOfType<LinkFlowContainer>().Single().ChildrenOfType<OsuSpriteText>().Any());
}
[Test]
public void TestNullBeatmap()
{
AddStep("set beatmap", () => BeatmapInfo.Value = null);
}
}
}

98
osu.Game/Screens/SelectV2/Wedge/DifficultyNameContent.cs Normal file
View File

@ -0,0 +1,98 @@
// 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 System;
using osu.Framework.Allocation;
using osu.Framework.Bindables;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Game.Beatmaps;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.Sprites;
namespace osu.Game.Screens.SelectV2.Wedge
{
public partial class DifficultyNameContent : CompositeDrawable
{
private OsuSpriteText difficultyName = null!;
private OsuSpriteText mappedByLabel = null!;
private LinkFlowContainer mapperName = null!;
[Resolved]
private IBindable<IBeatmapInfo?> beatmapInfo { get; set; } = null!;
public DifficultyNameContent()
{
RelativeSizeAxes = Axes.X;
AutoSizeAxes = Axes.Y;
}
[BackgroundDependencyLoader]
private void load()
{
InternalChild = new FillFlowContainer
{
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Direction = FillDirection.Horizontal,
Children = new Drawable[]
{
difficultyName = new TruncatingSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(weight: FontWeight.SemiBold),
},
mappedByLabel = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
// TODO: better null display? beatmap carousel panels also just show this text currently.
Text = " mapped by ",
Font = OsuFont.GetFont(size: 14),
},
mapperName = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(weight: FontWeight.SemiBold, size: 14))
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
AutoSizeAxes = Axes.Both,
},
}
};
}
protected override void LoadComplete()
{
base.LoadComplete();
beatmapInfo.BindValueChanged(b =>
{
difficultyName.Text = b.NewValue?.DifficultyName ?? string.Empty;
updateMapper();
}, true);
}
private void updateMapper()
{
mapperName.Clear();
switch (beatmapInfo.Value)
{
case BeatmapInfo localBeatmap:
// TODO: should be the mapper of the guest difficulty, but that isn't stored correctly yet (see https://github.com/ppy/osu/issues/12965)
mapperName.AddUserLink(localBeatmap.Metadata.Author);
break;
}
}
protected override void Update()
{
base.Update();
// truncate difficulty name when width exceeds bounds, prioritizing mapper name display
difficultyName.MaxWidth = Math.Max(DrawWidth - mappedByLabel.DrawWidth
- mapperName.DrawWidth, 0);
}
}
}