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

Fix status pill animating from zero height

Browse Source
This commit is contained in:
Dean Herbert
2025-04-10 19:59:20 +09:00
Unverified
parent 244bae5d43
commit 69035ef48f
8 changed files with 15 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Beatmaps/TestSceneBeatmapSetOnlineStatusPill.cs
-1
View File
@@ -28,7 +28,6 @@ namespace osu.Game.Tests.Visual.Beatmaps
Spacing = new Vector2(0, 10),
ChildrenEnumerable = Enum.GetValues(typeof(BeatmapOnlineStatus)).Cast<BeatmapOnlineStatus>().Select(status => new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.Centre,
Origin = Anchor.Centre,
Status = status
osu.Game/Beatmaps/Drawables/BeatmapSetOnlineStatusPill.cs
+15 -13
View File
@@ -19,10 +19,6 @@ namespace osu.Game.Beatmaps.Drawables
{
public partial class BeatmapSetOnlineStatusPill : CircularContainer, IHasTooltip
{
private const double animation_duration = 400;
private BeatmapOnlineStatus status;
public BeatmapOnlineStatus Status
{
get => status;
@@ -34,30 +30,27 @@ namespace osu.Game.Beatmaps.Drawables
status = value;
if (IsLoaded)
{
AutoSizeDuration = (float)animation_duration;
AutoSizeEasing = Easing.OutQuint;
updateState();
}
}
}
private BeatmapOnlineStatus status;
public float TextSize
{
get => statusText.Font.Size;
set => statusText.Font = statusText.Font.With(size: value);
init => statusText.Font = statusText.Font.With(size: value);
}
public MarginPadding TextPadding
{
get => statusText.Padding;
set => statusText.Padding = value;
init => statusText.Padding = value;
}
private readonly OsuSpriteText statusText;
private readonly Box background;
private const double animation_duration = 400;
[Resolved]
private OsuColour colours { get; set; } = null!;
@@ -66,6 +59,7 @@ namespace osu.Game.Beatmaps.Drawables
public BeatmapSetOnlineStatusPill()
{
AutoSizeAxes = Axes.Both;
Masking = true;
Alpha = 0;
@@ -105,6 +99,14 @@ namespace osu.Game.Beatmaps.Drawables
return;
}
// Only animate resizing if we already have a size.
// This avoids animating height from zero.
if (Width > 0)
{
AutoSizeDuration = (float)animation_duration;
AutoSizeEasing = Easing.OutQuint;
}
this.FadeIn(animation_duration, Easing.OutQuint);
Color4 statusTextColour;
osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtraInfoRow.cs
-1
View File
@@ -30,7 +30,6 @@ namespace osu.Game.Beatmaps.Drawables.Cards
{
new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Status = beatmapSet.Status,
Anchor = Anchor.CentreLeft,
Origin = Anchor.CentreLeft,
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
-1
View File
@@ -177,7 +177,6 @@ namespace osu.Game.Overlays.BeatmapSet
{
onlineStatusPill = new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
TextSize = 14,
osu.Game/Screens/Select/BeatmapInfoWedge.cs
-1
View File
@@ -263,7 +263,6 @@ namespace osu.Game.Screens.Select
},
new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Shear = -wedged_container_shear,
osu.Game/Screens/Select/Carousel/SetPanelContent.cs
-1
View File
@@ -77,7 +77,6 @@ namespace osu.Game.Screens.Select.Carousel
},
new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
TextSize = 11,
osu.Game/Screens/SelectV2/PanelBeatmapSet.cs
-1
View File
@@ -97,7 +97,6 @@ namespace osu.Game.Screens.SelectV2
},
statusPill = new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
TextSize = 11,
osu.Game/Screens/SelectV2/PanelBeatmapStandalone.cs
-1
View File
@@ -117,7 +117,6 @@ namespace osu.Game.Screens.SelectV2
},
statusPill = new BeatmapSetOnlineStatusPill
{
AutoSizeAxes = Axes.Both,
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
TextSize = 11,