h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2026-05-22 19:00:07 +08:00
Code Issues Releases Wiki Activity

Merge branch 'master' into ssv2-localisation-overlap

Browse Source
This commit is contained in:
Denis Titovets
2025-06-23 08:25:41 +03:00
committed by GitHub
Unverified
parent 4203f2cdeb b5e38255be
commit 522b7a2fff
3 changed files with 79 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+24
View File
@@ -243,6 +243,30 @@ namespace osu.Game.Tests.Visual.Online
});
}
[Test]
public void TestBeatmapSetHasVideoOrStoryboard()
{
AddStep("show beatmapset with video", () =>
{
var beatmapSet = getBeatmapSet();
beatmapSet.HasVideo = true;
overlay.ShowBeatmapSet(beatmapSet);
});
AddStep("show beatmapset with storyboard", () =>
{
var beatmapSet = getBeatmapSet();
beatmapSet.HasStoryboard = true;
overlay.ShowBeatmapSet(beatmapSet);
});
AddStep("show beatmapset with video and storyboard", () =>
{
var beatmapSet = getBeatmapSet();
beatmapSet.HasVideo = true;
beatmapSet.HasStoryboard = true;
overlay.ShowBeatmapSet(beatmapSet);
});
}
[Test]
public void TestSelectedModsDontAffectStatistics()
{
osu.Game/Beatmaps/Drawables/Cards/IconPill.cs
+6
View File
@@ -20,6 +20,12 @@ namespace osu.Game.Beatmaps.Drawables.Cards
set => iconContainer.Size = value;
}
public MarginPadding IconPadding
{
get => iconContainer.Padding;
set => iconContainer.Padding = value;
}
private readonly Container iconContainer;
protected IconPill(IconUsage icon)
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+49 -5
View File
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.Sprites;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Beatmaps.Drawables.Cards;
using osu.Game.Graphics;
using osu.Game.Graphics.Containers;
using osu.Game.Graphics.UserInterface;
@@ -46,6 +47,8 @@ namespace osu.Game.Overlays.BeatmapSet
private readonly Box coverGradient;
private readonly LinkFlowContainer title, artist;
private readonly AuthorInfo author;
private readonly VideoIconPill videoIconPill;
private readonly StoryboardIconPill storyboardIconPill;
private ExternalLinkButton externalLink;
@@ -175,13 +178,42 @@ namespace osu.Game.Overlays.BeatmapSet
Spacing = new Vector2(10),
Children = new Drawable[]
{
onlineStatusPill = new BeatmapSetOnlineStatusPill
new FillFlowContainer
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
TextSize = 14,
TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
AutoSizeAxes = Axes.Y,
RelativeSizeAxes = Axes.X,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(10),
Children = new Drawable[]
{
onlineStatusPill = new BeatmapSetOnlineStatusPill
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
TextSize = 14,
TextPadding = new MarginPadding { Horizontal = 35, Vertical = 10 }
},
storyboardIconPill = new StoryboardIconPill
{
AutoSizeAxes = Axes.X,
RelativeSizeAxes = Axes.Y,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
IconSize = new Vector2(34),
IconPadding = new MarginPadding(10),
},
videoIconPill = new VideoIconPill
{
AutoSizeAxes = Axes.X,
RelativeSizeAxes = Axes.Y,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
IconSize = new Vector2(34),
IconPadding = new MarginPadding(10),
},
}
},
Details = new Details(),
},
},
@@ -218,6 +250,8 @@ namespace osu.Game.Overlays.BeatmapSet
if (setInfo.NewValue == null)
{
onlineStatusPill.FadeTo(0.5f, 500, Easing.OutQuint);
videoIconPill.Hide();
storyboardIconPill.Hide();
fadeContent.Hide();
loading.Show();
@@ -235,6 +269,16 @@ namespace osu.Game.Overlays.BeatmapSet
loading.Hide();
if (setInfo.NewValue.HasVideo)
videoIconPill.Show();
else
videoIconPill.Hide();
if (setInfo.NewValue.HasStoryboard)
storyboardIconPill.Show();
else
storyboardIconPill.Hide();
var titleText = new RomanisableString(setInfo.NewValue.TitleUnicode, setInfo.NewValue.Title);
var artistText = new RomanisableString(setInfo.NewValue.ArtistUnicode, setInfo.NewValue.Artist);