From 5414ce9932887b082b37f5e663d4b7e3653a8de7 Mon Sep 17 00:00:00 2001
From: Unknown <aergwyn@t-online.de>
Date: Thu, 13 Sep 2018 10:18:20 +0200
Subject: [PATCH] add StatusPill to BeatmapInfoWedge and
 DrawabelCarouselBeatmapSet

---
 osu.Game/Screens/Select/BeatmapInfoWedge.cs   | 19 ++++++++++++++++-
 .../Carousel/DrawableCarouselBeatmapSet.cs    | 21 ++++++++++++++++---
 2 files changed, 36 insertions(+), 4 deletions(-)

diff --git a/osu.Game/Screens/Select/BeatmapInfoWedge.cs b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
index d26702fcf9..febd136e25 100644
--- a/osu.Game/Screens/Select/BeatmapInfoWedge.cs
+++ b/osu.Game/Screens/Select/BeatmapInfoWedge.cs
@@ -127,6 +127,7 @@ namespace osu.Game.Screens.Select
             public OsuSpriteText VersionLabel { get; private set; }
             public OsuSpriteText TitleLabel { get; private set; }
             public OsuSpriteText ArtistLabel { get; private set; }
+            public BeatmapSetOnlineStatusPill StatusPill { get; private set; }
             public FillFlowContainer MapperContainer { get; private set; }
             public FillFlowContainer InfoLabelContainer { get; private set; }
 
@@ -190,7 +191,7 @@ namespace osu.Game.Screens.Select
                     },
                     new FillFlowContainer
                     {
-                        Name = "Top-aligned metadata",
+                        Name = "Topleft-aligned metadata",
                         Anchor = Anchor.TopLeft,
                         Origin = Anchor.TopLeft,
                         Direction = FillDirection.Vertical,
@@ -207,6 +208,22 @@ namespace osu.Game.Screens.Select
                         }
                     },
                     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",
                         Anchor = Anchor.CentreLeft,
diff --git a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
index 23f338b530..52d34a935f 100644
--- a/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
+++ b/osu.Game/Screens/Select/Carousel/DrawableCarouselBeatmapSet.cs
@@ -78,11 +78,26 @@ namespace osu.Game.Screens.Select.Carousel
                             TextSize = 17,
                             Shadow = true,
                         },
-                        new FillFlowContainer<FilterableDifficultyIcon>
+                        new FillFlowContainer
                         {
-                            Margin = new MarginPadding { Top = 5 },
+                            Direction = FillDirection.Horizontal,
                             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()
+                                },
+                            }
                         }
                     }
                 }