From cdb779f764bb09dcba1784f66fc87aab9debfd8b Mon Sep 17 00:00:00 2001
From: Nathan Alo <n20gaming2000@gmail.com>
Date: Mon, 29 Mar 2021 17:30:23 +0800
Subject: [PATCH] move copy logic inside ComposeScreen

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 37 ++++++++++----
 .../Screens/Edit/Compose/SelectionHelper.cs   | 51 -------------------
 2 files changed, 26 insertions(+), 62 deletions(-)
 delete mode 100644 osu.Game/Screens/Edit/Compose/SelectionHelper.cs

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index 16043ff64b..f6ce5a4e3d 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -2,13 +2,17 @@
 // See the LICENCE file in the repository root for full licence text.
 
 using System.Diagnostics;
+using System.Linq;
+using System.Text;
 using osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Framework.Graphics;
 using osu.Framework.Graphics.Containers;
 using osu.Framework.Input;
 using osu.Framework.Input.Bindings;
+using osu.Framework.Platform;
 using osu.Game.Beatmaps;
+using osu.Game.Extensions;
 using osu.Game.Rulesets;
 using osu.Game.Rulesets.Edit;
 using osu.Game.Screens.Edit.Compose.Components.Timeline;
@@ -21,14 +25,17 @@ namespace osu.Game.Screens.Edit.Compose
         [Resolved]
         private IBindable<WorkingBeatmap> beatmap { get; set; }
 
-        private HitObjectComposer composer;
+        [Resolved]
+        private GameHost host { get; set; }
 
-        private readonly SelectionHelper helper;
+        [Resolved]
+        private EditorClock clock { get; set; }
+
+        private HitObjectComposer composer;
 
         public ComposeScreen()
             : base(EditorScreenMode.Compose)
         {
-            Add(helper = new SelectionHelper());
         }
 
         private Ruleset ruleset;
@@ -78,17 +85,25 @@ namespace osu.Game.Screens.Edit.Compose
             return beatmapSkinProvider.WithChild(rulesetSkinProvider.WithChild(content));
         }
 
+        private string formatSelectionAsString()
+        {
+            var builder = new StringBuilder();
+            builder.Append(EditorBeatmap.SelectedHitObjects.OrderBy(h => h.StartTime).FirstOrDefault()?.StartTime.ToEditorFormattedString() ?? clock.CurrentTime.ToEditorFormattedString());
+
+            if (EditorBeatmap.SelectedHitObjects.Any() && composer != null)
+                builder.Append($" ({composer.ConvertSelectionToString()})");
+
+            builder.Append(" - ");
+
+            return builder.ToString();
+        }
+
         public bool OnPressed(PlatformAction action)
         {
-            switch (action.ActionType)
-            {
-                case PlatformActionType.Copy:
-                    helper.CopySelectionToClipboard();
-                    return false;
+            if (action.ActionType == PlatformActionType.Copy)
+                host.GetClipboard().SetText(formatSelectionAsString());
 
-                default:
-                    return false;
-            }
+            return false;
         }
 
         public void OnReleased(PlatformAction action)
diff --git a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs b/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
deleted file mode 100644
index a01a9e0144..0000000000
--- a/osu.Game/Screens/Edit/Compose/SelectionHelper.cs
+++ /dev/null
@@ -1,51 +0,0 @@
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
-// See the LICENCE file in the repository root for full licence text.
-
-using System.Linq;
-using System.Text;
-using osu.Framework.Allocation;
-using osu.Framework.Graphics;
-using osu.Framework.Platform;
-using osu.Game.Extensions;
-using osu.Game.Rulesets.Edit;
-
-namespace osu.Game.Screens.Edit.Compose
-{
-    public class SelectionHelper : Component
-    {
-        [Resolved]
-        private GameHost host { get; set; }
-
-        [Resolved]
-        private EditorClock clock { get; set; }
-
-        [Resolved]
-        private EditorBeatmap editorBeatmap { get; set; }
-
-        [Resolved(CanBeNull = true)]
-        private HitObjectComposer composer { get; set; }
-
-        public void CopySelectionToClipboard()
-        {
-            host.GetClipboard().SetText(formatSelectionAsString());
-        }
-
-        private string formatSelectionAsString()
-        {
-            const string separator = " - ";
-            var builder = new StringBuilder();
-
-            if (!editorBeatmap.SelectedHitObjects.Any())
-            {
-                builder.Append($"{clock.CurrentTime.ToEditorFormattedString()}{separator}");
-                return builder.ToString();
-            }
-
-            string hitObjects = composer != null ? string.Join(',', composer.ConvertSelectionToString()) : string.Empty;
-
-            builder.Append(editorBeatmap.SelectedHitObjects.Min(h => h.StartTime).ToEditorFormattedString());
-            builder.Append($" ({hitObjects}){separator}");
-            return builder.ToString();
-        }
-    }
-}