From 45194b2b4a4ebb26ce3f1fc2e948f4d21495f828 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bart=C5=82omiej=20Dach?= <dach.bartlomiej@gmail.com>
Date: Sun, 9 Jul 2023 18:21:43 +0200
Subject: [PATCH] Fix pressing Ctrl-C in composer not copying timestamp to
 system clipboard

---
 .../Screens/Edit/Compose/ComposeScreen.cs     | 25 +++++++++-------
 osu.Game/Screens/Edit/EditorScreen.cs         | 29 +++++++------------
 2 files changed, 25 insertions(+), 29 deletions(-)

diff --git a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
index dc026f7eac..433fb5c8ee 100644
--- a/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
+++ b/osu.Game/Screens/Edit/Compose/ComposeScreen.cs
@@ -101,26 +101,31 @@ namespace osu.Game.Screens.Edit.Compose
 
         #region Clipboard operations
 
-        protected override void PerformCut()
+        public override void Cut()
         {
-            base.PerformCut();
+            if (!CanCut.Value)
+                return;
 
             Copy();
             EditorBeatmap.RemoveRange(EditorBeatmap.SelectedHitObjects.ToArray());
         }
 
-        protected override void PerformCopy()
+        public override void Copy()
         {
-            base.PerformCopy();
+            // on stable, pressing Ctrl-C would copy the current timestamp to system clipboard
+            // regardless of whether anything was even selected at all.
+            // UX-wise this is generally strange and unexpected, but make it work anyways to preserve muscle memory.
+            // note that this means that `getTimestamp()` must handle no-selection case, too.
+            host.GetClipboard()?.SetText(getTimestamp());
 
-            clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();
-
-            host.GetClipboard()?.SetText(formatSelectionAsString());
+            if (CanCopy.Value)
+                clipboard.Value = new ClipboardContent(EditorBeatmap).Serialize();
         }
 
-        protected override void PerformPaste()
+        public override void Paste()
         {
-            base.PerformPaste();
+            if (!CanPaste.Value)
+                return;
 
             var objects = clipboard.Value.Deserialize<ClipboardContent>().HitObjects;
 
@@ -147,7 +152,7 @@ namespace osu.Game.Screens.Edit.Compose
             CanPaste.Value = composer.IsLoaded && !string.IsNullOrEmpty(clipboard.Value);
         }
 
-        private string formatSelectionAsString()
+        private string getTimestamp()
         {
             if (composer == null)
                 return string.Empty;
diff --git a/osu.Game/Screens/Edit/EditorScreen.cs b/osu.Game/Screens/Edit/EditorScreen.cs
index b39c0cf5f3..3bc870b898 100644
--- a/osu.Game/Screens/Edit/EditorScreen.cs
+++ b/osu.Game/Screens/Edit/EditorScreen.cs
@@ -44,29 +44,23 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Performs a "cut to clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformCut()
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanCut"/> themselves.
+        /// </remarks>
+        public virtual void Cut()
         {
         }
 
-        public void Cut()
-        {
-            if (CanCut.Value)
-                PerformCut();
-        }
-
         public BindableBool CanCopy { get; } = new BindableBool();
 
         /// <summary>
         /// Performs a "copy to clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformCopy()
-        {
-        }
-
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanCopy"/> themselves.
+        /// </remarks>
         public virtual void Copy()
         {
-            if (CanCopy.Value)
-                PerformCopy();
         }
 
         public BindableBool CanPaste { get; } = new BindableBool();
@@ -74,14 +68,11 @@ namespace osu.Game.Screens.Edit
         /// <summary>
         /// Performs a "paste from clipboard" operation appropriate for the given screen.
         /// </summary>
-        protected virtual void PerformPaste()
-        {
-        }
-
+        /// <remarks>
+        /// Implementors are responsible for checking <see cref="CanPaste"/> themselves.
+        /// </remarks>
         public virtual void Paste()
         {
-            if (CanPaste.Value)
-                PerformPaste();
         }
 
         #endregion