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

Merge pull request #36796 from Joehuu/standardise-play-favourite-order

Browse Source 
Standardise display order of playcount / favourites
This commit is contained in:
Bartłomiej Dach
2026-03-03 11:22:51 +01:00
committed by GitHub
Unverified
parent d748470754 564b6ebd0c
commit d37f59430b
6 changed files with 39 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game.Tests/Visual/Online/TestSceneBeatmapSetOverlay.cs
+4
View File
@@ -72,6 +72,10 @@ namespace osu.Game.Tests.Visual.Online
Preview = @"https://b.ppy.sh/preview/12345.mp3",
PlayCount = 123,
FavouriteCount = 456,
NominationStatus = new BeatmapSetNominationStatus
{
Current = 2,
},
Submitted = DateTime.Now,
Ranked = DateTime.Now,
BPM = 111,
osu.Game/Beatmaps/Drawables/Cards/BeatmapCardExtra.cs
+9 -9
View File
@@ -296,20 +296,20 @@ namespace osu.Game.Beatmaps.Drawables.Cards
return original;
}
statisticsContainer.Content[0][0] = withMargin(new FavouritesStatistic(BeatmapSet)
{
Current = FavouriteState,
});
statisticsContainer.Content[1][0] = withMargin(new PlayCountStatistic(BeatmapSet));
var hypesStatistic = HypesStatistic.CreateFor(BeatmapSet);
if (hypesStatistic != null)
statisticsContainer.Content[0][1] = withMargin(hypesStatistic);
statisticsContainer.Content[0][0] = withMargin(hypesStatistic);
var nominationsStatistic = NominationsStatistic.CreateFor(BeatmapSet);
if (nominationsStatistic != null)
statisticsContainer.Content[1][1] = withMargin(nominationsStatistic);
statisticsContainer.Content[1][0] = withMargin(nominationsStatistic);
statisticsContainer.Content[0][1] = withMargin(new PlayCountStatistic(BeatmapSet));
statisticsContainer.Content[1][1] = withMargin(new FavouritesStatistic(BeatmapSet)
{
Current = FavouriteState,
});
var dateStatistic = BeatmapCardDateStatistic.CreateFor(BeatmapSet);
if (dateStatistic != null)
osu.Game/Beatmaps/Drawables/Cards/BeatmapCardNormal.cs
+1 -1
View File
@@ -278,8 +278,8 @@ namespace osu.Game.Beatmaps.Drawables.Cards
if (nominationsStatistic != null)
yield return nominationsStatistic;
yield return new FavouritesStatistic(BeatmapSet) { Current = FavouriteState };
yield return new PlayCountStatistic(BeatmapSet);
yield return new FavouritesStatistic(BeatmapSet) { Current = FavouriteState };
var dateStatistic = BeatmapCardDateStatistic.CreateFor(BeatmapSet);
if (dateStatistic != null)
osu.Game/Beatmaps/Drawables/Cards/Statistics/BeatmapCardDateStatistic.cs
+1 -1
View File
@@ -17,7 +17,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Statistics
{
this.dateTime = dateTime;
Icon = FontAwesome.Regular.CheckCircle;
Icon = FontAwesome.Solid.CheckCircle;
Text = dateTime.ToLocalisedMediumDate();
}
osu.Game/Beatmaps/Drawables/Cards/Statistics/PlayCountStatistic.cs
+1 -1
View File
@@ -15,7 +15,7 @@ namespace osu.Game.Beatmaps.Drawables.Cards.Statistics
{
public PlayCountStatistic(IBeatmapSetOnlineInfo onlineInfo)
{
Icon = FontAwesome.Regular.PlayCircle;
Icon = FontAwesome.Solid.PlayCircle;
Text = onlineInfo.PlayCount.ToMetric(decimals: 1);
TooltipText = BeatmapsStrings.PanelPlaycount(onlineInfo.PlayCount.ToLocalisableString(@"N0"));
}
osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+23 -3
View File
@@ -9,10 +9,12 @@ using osu.Framework.Bindables;
using osu.Framework.Extensions.LocalisationExtensions;
using osu.Framework.Graphics;
using osu.Framework.Graphics.Containers;
using osu.Framework.Graphics.Cursor;
using osu.Framework.Graphics.Shapes;
using osu.Framework.Graphics.Sprites;
using osu.Framework.Input.Events;
using osu.Framework.Localisation;
using osu.Game.Beatmaps;
using osu.Game.Beatmaps.Drawables;
using osu.Game.Extensions;
using osu.Game.Graphics;
@@ -32,7 +34,7 @@ namespace osu.Game.Overlays.BeatmapSet
private const float tile_spacing = 2;
private readonly LinkFlowContainer infoContainer;
private readonly Statistic plays, favourites;
private readonly Statistic nominations, plays, favourites;
public readonly DifficultiesContainer Difficulties;
@@ -107,7 +109,14 @@ namespace osu.Game.Overlays.BeatmapSet
Margin = new MarginPadding { Top = 5 },
Children = new[]
{
plays = new Statistic(FontAwesome.Solid.PlayCircle),
nominations = new Statistic(FontAwesome.Solid.ThumbsUp)
{
TooltipText = BeatmapsetsStrings.ShowStatsNominations,
},
plays = new Statistic(FontAwesome.Solid.PlayCircle)
{
TooltipText = BeatmapsetsStrings.ShowStatsPlaycount,
},
favourites = new Statistic(FontAwesome.Solid.Heart),
},
},
@@ -176,8 +185,17 @@ namespace osu.Game.Overlays.BeatmapSet
// Else just choose the first available difficulty for now.
Beatmap.Value ??= Difficulties.FirstOrDefault()?.Beatmap;
if (beatmapSet?.Status == BeatmapOnlineStatus.Pending && beatmapSet.NominationStatus != null)
{
nominations.Show();
nominations.Value = beatmapSet.NominationStatus.Current;
}
else
nominations.Hide();
plays.Value = BeatmapSet?.PlayCount ?? 0;
favourites.Value = BeatmapSet?.FavouriteCount ?? 0;
favourites.TooltipText = BeatmapSet?.FavouriteCount > 0 ? BeatmapsetsStrings.ShowStatsFavourites : BeatmapsetsStrings.ShowStatsNoFavourites;
updateDifficultyButtons();
}
@@ -367,7 +385,7 @@ namespace osu.Game.Overlays.BeatmapSet
}
}
private partial class Statistic : FillFlowContainer
private partial class Statistic : FillFlowContainer, IHasTooltip
{
private readonly OsuSpriteText text;
@@ -407,6 +425,8 @@ namespace osu.Game.Overlays.BeatmapSet
},
};
}
public LocalisableString TooltipText { get; set; }
}
public enum DifficultySelectorState