From 1095669a5583a6ca81e8e27e65fdc8d45655a704 Mon Sep 17 00:00:00 2001
From: Joehu <jmadamba07@hotmail.com>
Date: Thu, 31 May 2018 08:09:19 -0700
Subject: [PATCH] Match panel with web

---
 osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs     |  5 +++
 .../API/Requests/APIResponseBeatmapSet.cs     |  4 +++
 osu.Game/Overlays/Direct/DirectGridPanel.cs   | 33 +++++++++++++++----
 osu.Game/Overlays/Direct/PlayButton.cs        |  2 +-
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
index a70caf0207..8f985306e3 100644
--- a/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
+++ b/osu.Game/Beatmaps/BeatmapSetOnlineInfo.cs
@@ -36,6 +36,11 @@ namespace osu.Game.Beatmaps
         /// </summary>
         public bool HasVideo { get; set; }
 
+        /// <summary>
+        /// Whether or not this beatmap set has a storyboard.
+        /// </summary>
+        public bool HasStoryboard { get; set; }
+
         /// <summary>
         /// The different sizes of cover art for this beatmap set.
         /// </summary>
diff --git a/osu.Game/Online/API/Requests/APIResponseBeatmapSet.cs b/osu.Game/Online/API/Requests/APIResponseBeatmapSet.cs
index 2661303652..44c1216959 100644
--- a/osu.Game/Online/API/Requests/APIResponseBeatmapSet.cs
+++ b/osu.Game/Online/API/Requests/APIResponseBeatmapSet.cs
@@ -30,6 +30,9 @@ namespace osu.Game.Online.API.Requests
         [JsonProperty(@"video")]
         private bool hasVideo { get; set; }
 
+        [JsonProperty(@"storyboard")]
+        private bool hasStoryboard { get; set; }
+
         [JsonProperty(@"status")]
         private BeatmapSetOnlineStatus status { get; set; }
 
@@ -65,6 +68,7 @@ namespace osu.Game.Online.API.Requests
                     BPM = bpm,
                     Status = status,
                     HasVideo = hasVideo,
+                    HasStoryboard = hasStoryboard,
                     Submitted = submitted,
                     Ranked = ranked,
                     LastUpdated = lastUpdated,
diff --git a/osu.Game/Overlays/Direct/DirectGridPanel.cs b/osu.Game/Overlays/Direct/DirectGridPanel.cs
index 9715615d14..1f0c097811 100644
--- a/osu.Game/Overlays/Direct/DirectGridPanel.cs
+++ b/osu.Game/Overlays/Direct/DirectGridPanel.cs
@@ -149,7 +149,7 @@ namespace osu.Game.Overlays.Direct
                                             {
                                                 new OsuSpriteText
                                                 {
-                                                    Text = $"from {SetInfo.Metadata.Source}",
+                                                    Text = $"{SetInfo.Metadata.Source}",
                                                     TextSize = 14,
                                                     Shadow = false,
                                                     Colour = colours.Gray5,
@@ -195,18 +195,18 @@ namespace osu.Game.Overlays.Direct
                         new Statistic(FontAwesome.fa_heart, SetInfo.OnlineInfo?.FavouriteCount ?? 0),
                     },
                 },
-                playButton = new PlayButton(SetInfo)
-                {
-                    Margin = new MarginPadding { Top = 5, Left = 10 },
-                    Size = new Vector2(30),
-                    Alpha = 0,
-                },
                 statusContainer = new FillFlowContainer
                 {
                     AutoSizeAxes = Axes.Both,
                     Margin = new MarginPadding { Top = 5, Left = 5 },
                     Spacing = new Vector2(5),
                 },
+                playButton = new PlayButton(SetInfo)
+                {
+                    Margin = new MarginPadding { Top = 5, Left = 10 },
+                    Size = new Vector2(30),
+                    Alpha = 0,
+                },
             });
 
             if (SetInfo.OnlineInfo?.HasVideo ?? false)
@@ -214,6 +214,11 @@ namespace osu.Game.Overlays.Direct
                 statusContainer.Add(new IconPill(FontAwesome.fa_film));
             }
 
+            if (SetInfo.OnlineInfo?.HasStoryboard ?? false)
+            {
+                statusContainer.Add(new IconPill(FontAwesome.fa_image));
+            }
+
             statusContainer.Add(new BeatmapSetOnlineStatusPill(12, new MarginPadding { Horizontal = 10, Vertical = 5 })
             {
                 Status = SetInfo.OnlineInfo?.Status ?? BeatmapSetOnlineStatus.None,
@@ -233,5 +238,19 @@ namespace osu.Game.Overlays.Direct
 
             statusContainer.FadeIn(120, Easing.InOutQuint);
         }
+
+        protected override void Update()
+        {
+            base.Update();
+
+            if (PreviewPlaying)
+            {
+                statusContainer.Hide();
+            }
+            else if (!IsHovered)
+            {
+                statusContainer.Show();
+            }
+        }
     }
 }
diff --git a/osu.Game/Overlays/Direct/PlayButton.cs b/osu.Game/Overlays/Direct/PlayButton.cs
index 4913b11ae1..131083c6ff 100644
--- a/osu.Game/Overlays/Direct/PlayButton.cs
+++ b/osu.Game/Overlays/Direct/PlayButton.cs
@@ -126,7 +126,7 @@ namespace osu.Game.Overlays.Direct
                 return;
             }
 
-            icon.Icon = playing ? FontAwesome.fa_pause : FontAwesome.fa_play;
+            icon.Icon = playing ? FontAwesome.fa_stop : FontAwesome.fa_play;
             icon.FadeColour(playing || IsHovered ? hoverColour : Color4.White, 120, Easing.InOutQuint);
 
             if (playing)