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

Use link flow at a higher level to fix broken layout

Browse Source
This commit is contained in:
Bartłomiej Dach
2025-03-17 12:52:30 +01:00
Unverified
parent e430619e0e
commit 87932f707d
2 changed files with 41 additions and 81 deletions
Download Patch File Download Diff File Expand all files Collapse all files
osu.Game/Overlays/BeatmapSet/BeatmapPicker.cs
+40 -80
View File
@@ -12,6 +12,7 @@ using osu.Framework.Graphics.Containers;
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;
@@ -31,9 +32,7 @@ namespace osu.Game.Overlays.BeatmapSet
private const float tile_icon_padding = 7;
private const float tile_spacing = 2;
private readonly OsuSpriteText version, starRating, starRatingText;
private readonly LinkFlowContainer guestMapperContainer;
private readonly FillFlowContainer starRatingContainer;
private readonly LinkFlowContainer infoContainer;
private readonly Statistic plays, favourites;
public readonly DifficultiesContainer Difficulties;
@@ -53,6 +52,9 @@ namespace osu.Game.Overlays.BeatmapSet
}
}
[Resolved]
private OsuColour colours { get; set; } = null!;
public BeatmapPicker()
{
RelativeSizeAxes = Axes.X;
@@ -72,59 +74,13 @@ namespace osu.Game.Overlays.BeatmapSet
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
Margin = new MarginPadding { Left = -(tile_icon_padding + tile_spacing / 2), Bottom = 10 },
OnLostHover = () =>
{
showBeatmap(Beatmap.Value);
starRatingContainer.FadeOut(100);
},
OnLostHover = () => showBeatmap(Beatmap.Value, withStarRating: false),
},
new FillFlowContainer
infoContainer = new LinkFlowContainer(t => t.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 11))
{
AutoSizeAxes = Axes.Both,
Spacing = new Vector2(5f),
Children = new Drawable[]
{
version = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold)
},
guestMapperContainer = new LinkFlowContainer(s =>
s.Font = OsuFont.GetFont(weight: FontWeight.Bold, size: 11))
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Margin = new MarginPadding { Bottom = 1 },
},
starRatingContainer = new FillFlowContainer
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Alpha = 0,
Direction = FillDirection.Horizontal,
Spacing = new Vector2(2f, 0),
Margin = new MarginPadding { Bottom = 1 },
Children = new[]
{
starRatingText = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold),
Text = BeatmapsetsStrings.ShowStatsStars,
},
starRating = new OsuSpriteText
{
Anchor = Anchor.BottomLeft,
Origin = Anchor.BottomLeft,
Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold),
Text = string.Empty,
},
}
},
},
RelativeSizeAxes = Axes.X,
AutoSizeAxes = Axes.Y,
TextAnchor = Anchor.BottomLeft,
},
new FillFlowContainer
{
@@ -144,7 +100,7 @@ namespace osu.Game.Overlays.BeatmapSet
Beatmap.ValueChanged += b =>
{
showBeatmap(b.NewValue);
showBeatmap(b.NewValue, withStarRating: Difficulties.Any(d => d.IsHovered));
updateDifficultyButtons();
};
}
@@ -153,10 +109,8 @@ namespace osu.Game.Overlays.BeatmapSet
private IBindable<RulesetInfo> ruleset { get; set; } = null!;
[BackgroundDependencyLoader]
private void load(OsuColour colours)
private void load()
{
starRating.Colour = colours.Yellow;
starRatingText.Colour = colours.Yellow;
updateDisplay();
}
@@ -185,16 +139,12 @@ namespace osu.Game.Overlays.BeatmapSet
State = DifficultySelectorState.NotSelected,
OnHovered = beatmap =>
{
showBeatmap(beatmap);
starRating.Text = beatmap.StarRating.FormatStarRating();
starRatingContainer.FadeIn(100);
showBeatmap(beatmap, withStarRating: true);
},
OnClicked = beatmap => { Beatmap.Value = beatmap; },
});
}
starRatingContainer.FadeOut(100);
// If a selection is already made, try and maintain it.
if (Beatmap.Value != null)
Beatmap.Value = Difficulties.FirstOrDefault(b => b.Beatmap.OnlineID == Beatmap.Value.OnlineID)?.Beatmap;
@@ -208,9 +158,13 @@ namespace osu.Game.Overlays.BeatmapSet
updateDifficultyButtons();
}
private void showBeatmap(APIBeatmap? beatmapInfo)
private void showBeatmap(APIBeatmap? beatmapInfo, bool withStarRating)
{
guestMapperContainer.Clear();
infoContainer.Clear();
infoContainer.AddText(beatmapInfo?.DifficultyName ?? string.Empty, s => s.Font = OsuFont.GetFont(size: 17, weight: FontWeight.Bold));
infoContainer.AddArbitraryDrawable(Empty().With(e => e.Width = 5));
var beatmapOwners = beatmapInfo?.BeatmapOwners;
bool isHostDifficulty = beatmapOwners?.Length == 1 && beatmapOwners.First().Id == beatmapSet?.AuthorID;
@@ -225,33 +179,29 @@ namespace osu.Game.Overlays.BeatmapSet
break;
case 1:
guestMapperContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
guestMapperContainer.AddUserLink(users[0]);
infoContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
infoContainer.AddUserLink(users[0]);
break;
case 2:
guestMapperContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
guestMapperContainer.AddUserLink(users[0]);
guestMapperContainer.AddText(CommonStrings.ArrayAndTwoWordsConnector);
guestMapperContainer.AddUserLink(users[1]);
infoContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
infoContainer.AddUserLink(users[0]);
infoContainer.AddText(CommonStrings.ArrayAndTwoWordsConnector);
infoContainer.AddUserLink(users[1]);
break;
default:
{
guestMapperContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
infoContainer.AddText(BeatmapsetsStrings.ShowDetailsMappedBy(string.Empty));
for (int i = 0; i < count; i++)
{
guestMapperContainer.AddUserLink(users[i]);
infoContainer.AddUserLink(users[i]);
if (i < count - 2)
{
guestMapperContainer.AddText(CommonStrings.ArrayAndWordsConnector);
}
infoContainer.AddText(CommonStrings.ArrayAndWordsConnector);
else if (i == count - 2)
{
guestMapperContainer.AddText(CommonStrings.ArrayAndLastWordConnector);
}
infoContainer.AddText(CommonStrings.ArrayAndLastWordConnector);
}
break;
@@ -259,7 +209,17 @@ namespace osu.Game.Overlays.BeatmapSet
}
}
version.Text = beatmapInfo?.DifficultyName ?? string.Empty;
if (withStarRating)
{
infoContainer.AddArbitraryDrawable(Empty().With(e => e.Width = 5));
infoContainer.AddText(
LocalisableString.Interpolate($"{BeatmapsetsStrings.ShowStatsStars} {beatmapInfo?.StarRating.FormatStarRating()}"),
t =>
{
t.Font = OsuFont.GetFont(size: 11, weight: FontWeight.Bold);
t.Colour = colours.Yellow;
});
}
}
private void updateDifficultyButtons()
osu.Game/Overlays/BeatmapSet/BeatmapSetHeaderContent.cs
+1 -1
View File
@@ -98,7 +98,7 @@ namespace osu.Game.Overlays.BeatmapSet
{
Vertical = BeatmapSetOverlay.Y_PADDING,
Left = WaveOverlayContainer.HORIZONTAL_PADDING,
Right = WaveOverlayContainer.HORIZONTAL_PADDING + BeatmapSetOverlay.RIGHT_WIDTH,
Right = WaveOverlayContainer.HORIZONTAL_PADDING + BeatmapSetOverlay.RIGHT_WIDTH + 10,
},
Children = new Drawable[]
{