sim1222/osukey
1
1
Fork 0
mirror of https://github.com/osukey/osukey.git synced 2025-07-01 16:29:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

add StatusPill to BeatmapInfoWedge and DrawabelCarouselBeatmapSet

Browse Source
This commit is contained in:
Unknown
2018-09-13 10:18:20 +02:00
parent 13b988053a
commit 5414ce9932
2 changed files with 36 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -127,6 +127,7 @@ namespace osu.Game.Screens.Select
public OsuSpriteText VersionLabel { get; private set; } public OsuSpriteText VersionLabel { get; private set; }
public OsuSpriteText TitleLabel { get; private set; } public OsuSpriteText TitleLabel { get; private set; }
public OsuSpriteText ArtistLabel { get; private set; } public OsuSpriteText ArtistLabel { get; private set; }
public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
public FillFlowContainer MapperContainer { get; private set; } public FillFlowContainer MapperContainer { get; private set; }
public FillFlowContainer InfoLabelContainer { get; private set; } public FillFlowContainer InfoLabelContainer { get; private set; }
@ -190,7 +191,7 @@ namespace osu.Game.Screens.Select
}, },
new FillFlowContainer new FillFlowContainer
{ {
Name = "Top-aligned metadata", Name = "Topleft-aligned metadata",
Anchor = Anchor.TopLeft, Anchor = Anchor.TopLeft,
Origin = Anchor.TopLeft, Origin = Anchor.TopLeft,
Direction = FillDirection.Vertical, Direction = FillDirection.Vertical,
@ -207,6 +208,22 @@ namespace osu.Game.Screens.Select
} }
}, },
new FillFlowContainer new FillFlowContainer
{
Name = "Topright-aligned metadata",
Anchor = Anchor.TopRight,
Origin = Anchor.TopRight,
Direction = FillDirection.Vertical,
Margin = new MarginPadding { Top = 14, Left = 10, Right = 18, Bottom = 20 },
AutoSizeAxes = Axes.Both,
Children = new Drawable[]
{
StatusPill = new BeatmapSetOnlineStatusPill(11, new MarginPadding { Horizontal = 8, Vertical = 2 })
{
Status = beatmapInfo.Status,
}
}
},
new FillFlowContainer
{ {
Name = "Centre-aligned metadata", Name = "Centre-aligned metadata",
Anchor = Anchor.CentreLeft, Anchor = Anchor.CentreLeft,

21
osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
View File

@ -78,11 +78,26 @@ namespace osu.Game.Screens.Select.Carousel
TextSize = 17, TextSize = 17,
Shadow = true, Shadow = true,
}, },
new FillFlowContainer<FilterableDifficultyIcon> new FillFlowContainer
{ {
Margin = new MarginPadding { Top = 5 }, Direction = FillDirection.Horizontal,
AutoSizeAxes = Axes.Both, AutoSizeAxes = Axes.Both,
Children = ((CarouselBeatmapSet)Item).Beatmaps.Select(b => new FilterableDifficultyIcon(b)).ToList() Margin = new MarginPadding { Top = 5 },
Children = new Drawable[]
{
new BeatmapSetOnlineStatusPill(11, new MarginPadding { Horizontal = 8, Vertical = 2 })
{
Origin = Anchor.CentreLeft,
Anchor = Anchor.CentreLeft,
Margin = new MarginPadding{ Right = 5 },
Status = beatmapSet.Status
},
new FillFlowContainer<FilterableDifficultyIcon>
{
AutoSizeAxes = Axes.Both,
Children = ((CarouselBeatmapSet)Item).Beatmaps.Select(b => new FilterableDifficultyIcon(b)).ToList()
},
}
} }
} }
} }