h1or4dme8/osu-lazer
1
0
Fork 0
mirror of https://github.com/ppy/osu.git synced 2024-12-16 00:52:59 +08:00
Code Issues Releases Wiki Activity

reduced complexity

Browse Source
This commit is contained in:
Denrage 2021-05-05 17:51:29 +02:00
parent 5049e2fbf9
commit 88506a51dd
1 changed files with 34 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
osu.Game/Screens/Select/BeatmapInfoWedge.cs
View File

@ -233,15 +233,35 @@ namespace osu.Game.Screens.Select
}, },
} }
}, },
topRightMetadataContainer = new Container new FillFlowContainer
{ {
Name = "Topright-aligned metadata", Name = "Topright-aligned metadata",
Anchor = Anchor.TopRight, Anchor = Anchor.TopRight,
Origin = Anchor.TopRight, Origin = Anchor.TopRight,
Direction = FillDirection.Vertical,
Padding = new MarginPadding { Top = 14, Right = shear_width / 2 }, Padding = new MarginPadding { Top = 14, Right = shear_width / 2 },
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Shear = wedged_container_shear, Shear = wedged_container_shear,
Child = createTopRightMetadataContainer(beatmapInfo, starDifficulty.Value ?? new StarDifficulty()) Children = new Drawable[]
{
starRatingContainer = new Container
{
AutoSizeAxes = Axes.Both,
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Shear = -wedged_container_shear,
Margin = new MarginPadding { Bottom = 5 }
},
StatusPill = new BeatmapSetOnlineStatusPill
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Shear = -wedged_container_shear,
TextSize = 11,
TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
Status = beatmapInfo.Status,
}
}
}, },
new FillFlowContainer new FillFlowContainer
{ {
@ -299,51 +319,24 @@ namespace osu.Game.Screens.Select
{ {
var difficulty = valueChanged.NewValue ?? new StarDifficulty(); var difficulty = valueChanged.NewValue ?? new StarDifficulty();
topRightMetadataContainer.Child.FadeOut(250); if (starRatingContainer.Children.Count > 0)
topRightMetadataContainer.Child.Expire(); {
topRightMetadataContainer.Child = createTopRightMetadataContainer(beatmap.BeatmapInfo, difficulty); starRatingContainer.Child.FadeOut(250);
starRatingContainer.Child.Expire();
difficultyColourBarContainer.Child.Expire();
difficultyColourBarContainer.Child = createDifficultyColourBar(difficulty);
} }
private DifficultyColourBar createDifficultyColourBar(StarDifficulty difficulty) starRatingContainer.Child = difficulty.Stars > 0 ? new StarRatingDisplay(difficulty) : Empty();
=> new DifficultyColourBar(difficulty)
if (difficultyColourBarContainer.Children.Count > 0)
{
difficultyColourBarContainer.Child.Expire();
}
difficultyColourBarContainer.Child = new DifficultyColourBar(difficulty)
{ {
RelativeSizeAxes = Axes.Y, RelativeSizeAxes = Axes.Y,
Width = 20, Width = 20,
}; };
private FillFlowContainer createTopRightMetadataContainer(BeatmapInfo beatmapInfo, StarDifficulty difficulty)
{
var container = new FillFlowContainer
{
Direction = FillDirection.Vertical,
AutoSizeAxes = Axes.Both,
};
if (difficulty.Stars > 0)
{
container.Add(new StarRatingDisplay(difficulty)
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Shear = -wedged_container_shear,
Margin = new MarginPadding { Bottom = 5 }
});
}
container.Add(StatusPill = new BeatmapSetOnlineStatusPill
{
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Shear = -wedged_container_shear,
TextSize = 11,
TextPadding = new MarginPadding { Horizontal = 8, Vertical = 2 },
Status = beatmapInfo.Status,
});
return container;
} }
private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent) private void refreshModInformation(ValueChangedEvent<IReadOnlyList<Mod>> modsChangedEvent)