Make download buttons disappear instead of closing overlay.

- Also unbind event handlers - Remove unused field
ppy · Nov 16, 2017 · 97c5956 · 97c5956
1 parent df53b88
commit 97c5956
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 10 deletions.
diff --git a/osu.Game/Overlays/BeatmapSet/Header.cs b/osu.Game/Overlays/BeatmapSet/Header.cs
@@ -51,6 +51,7 @@ public BeatmapSetInfo BeatmapSet
                 title.Text = BeatmapSet.Metadata.Title;
                 artist.Text = BeatmapSet.Metadata.Artist;
 
+                downloadButtonsContainer.FadeIn();
                 noVideoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 0 : 1, transition_duration);
                 videoButtons.FadeTo(BeatmapSet.OnlineInfo.HasVideo ? 1 : 0, transition_duration);
 
@@ -224,6 +225,20 @@ private void load(OsuColour colours, BeatmapManager beatmaps)
         {
             tabsBg.Colour = colours.Gray3;
             this.beatmaps = beatmaps;
+
+            beatmaps.BeatmapSetAdded += handleBeatmapAdd;
+        }
+
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            beatmaps.BeatmapSetAdded -= handleBeatmapAdd;
+        }
+
+        private void handleBeatmapAdd(BeatmapSetInfo beatmap)
+        {
+            if (beatmap.OnlineBeatmapSetID == BeatmapSet.OnlineBeatmapSetID)
+                downloadButtonsContainer.FadeOut(transition_duration);
         }
 
         private void download(bool noVideo)

diff --git a/osu.Game/Overlays/BeatmapSetOverlay.cs b/osu.Game/Overlays/BeatmapSetOverlay.cs
@@ -24,8 +24,6 @@ public class BeatmapSetOverlay : WaveOverlayContainer
         public const float X_PADDING = 40;
         public const float RIGHT_WIDTH = 275;
 
-        private BeatmapSetInfo currentBeatmap;
-
         private readonly Header header;
         private readonly Info info;
 
@@ -87,16 +85,10 @@ public BeatmapSetOverlay()
         }
 
         [BackgroundDependencyLoader]
-        private void load(APIAccess api, RulesetStore rulesets, BeatmapManager manager)
+        private void load(APIAccess api, RulesetStore rulesets)
         {
             this.api = api;
             this.rulesets = rulesets;
-
-            manager.BeatmapSetAdded += beatmap =>
-            {
-                if (beatmap.OnlineBeatmapSetID == currentBeatmap.OnlineBeatmapSetID)
-                    Hide();
-            };
         }
 
         protected override void PopIn()
@@ -128,7 +120,7 @@ public void ShowBeatmapSet(int beatmapSetId)
 
         public void ShowBeatmapSet(BeatmapSetInfo set)
         {
-            currentBeatmap = header.BeatmapSet = info.BeatmapSet = set;
+            header.BeatmapSet = info.BeatmapSet = set;
             Show();
             scroll.ScrollTo(0);
         }

diff --git a/osu.Game/Overlays/Direct/DirectPanel.cs b/osu.Game/Overlays/Direct/DirectPanel.cs
@@ -107,6 +107,12 @@ private void load(BeatmapManager beatmaps, OsuColour colours, BeatmapSetOverlay
             beatmaps.BeatmapDownloadBegan += attachDownload;
         }
 
+        protected override void Dispose(bool isDisposing)
+        {
+            base.Dispose(isDisposing);
+            beatmaps.BeatmapDownloadBegan -= attachDownload;
+        }
+
         protected override void Update()
         {
             base.Update();