From e4cfa7c86f793042c311e706ec1c70fcf86a1a9f Mon Sep 17 00:00:00 2001
From: OliBomby <olivierschipper@gmail.com>
Date: Tue, 17 Sep 2024 11:27:23 +0200
Subject: [PATCH] Add view menu toggle for sample points

---
 osu.Game/Configuration/OsuConfigManager.cs        |  4 +++-
 osu.Game/Localisation/EditorStrings.cs            |  5 +++++
 .../Components/Timeline/SamplePointPiece.cs       | 15 ++++++++++++++-
 osu.Game/Screens/Edit/Editor.cs                   |  6 ++++++
 4 files changed, 28 insertions(+), 2 deletions(-)

diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 8d6c244b35..ae2025fb50 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -205,6 +205,7 @@ namespace osu.Game.Configuration
 
             SetDefault(OsuSetting.EditorTimelineShowTimingChanges, true);
             SetDefault(OsuSetting.EditorTimelineShowTicks, true);
+            SetDefault(OsuSetting.EditorTimelineShowSamples, true);
 
             SetDefault(OsuSetting.AlwaysShowHoldForMenuButton, false);
         }
@@ -431,6 +432,7 @@ namespace osu.Game.Configuration
         HideCountryFlags,
         EditorTimelineShowTimingChanges,
         EditorTimelineShowTicks,
-        AlwaysShowHoldForMenuButton
+        AlwaysShowHoldForMenuButton,
+        EditorTimelineShowSamples
     }
 }
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
index bcffc18d4d..f72a0f4a26 100644
--- a/osu.Game/Localisation/EditorStrings.cs
+++ b/osu.Game/Localisation/EditorStrings.cs
@@ -139,6 +139,11 @@ namespace osu.Game.Localisation
         /// </summary>
         public static LocalisableString TimelineShowTicks => new TranslatableString(getKey(@"timeline_show_ticks"), @"Show ticks");
 
+        /// <summary>
+        /// "Show samples"
+        /// </summary>
+        public static LocalisableString TimelineShowSamples => new TranslatableString(getKey(@"timeline_show_samples"), @"Show samples");
+
         private static string getKey(string key) => $@"{prefix}:{key}";
     }
 }
diff --git a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
index a8cf8723f2..3843d56d06 100644
--- a/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
+++ b/osu.Game/Screens/Edit/Compose/Components/Timeline/SamplePointPiece.cs
@@ -16,6 +16,7 @@ using osu.Framework.Graphics.UserInterface;
 using osu.Framework.Input.Events;
 using osu.Framework.Utils;
 using osu.Game.Audio;
+using osu.Game.Configuration;
 using osu.Game.Graphics;
 using osu.Game.Graphics.UserInterface;
 using osu.Game.Graphics.UserInterfaceV2;
@@ -40,6 +41,8 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         [Resolved]
         private Editor? editor { get; set; }
 
+        private Bindable<bool> samplesVisible = null!;
+
         public SamplePointPiece(HitObject hitObject)
         {
             HitObject = hitObject;
@@ -53,13 +56,23 @@ namespace osu.Game.Screens.Edit.Compose.Components.Timeline
         protected virtual double GetTime() => HitObject is IHasRepeats r ? HitObject.StartTime + r.Duration / r.SpanCount() / 2 : HitObject.StartTime;
 
         [BackgroundDependencyLoader]
-        private void load()
+        private void load(OsuConfigManager config)
         {
             HitObject.DefaultsApplied += _ => updateText();
             updateText();
 
             if (editor != null)
                 editor.ShowSampleEditPopoverRequested += onShowSampleEditPopoverRequested;
+
+            samplesVisible = config.GetBindable<bool>(OsuSetting.EditorTimelineShowSamples);
+        }
+
+        protected override void LoadComplete()
+        {
+            base.LoadComplete();
+
+            samplesVisible.BindValueChanged(visible => this.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint));
+            this.FadeTo(samplesVisible.Value ? 1 : 0);
         }
 
         protected override void Dispose(bool isDisposing)
diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
index 9bb91af806..b059557b28 100644
--- a/osu.Game/Screens/Edit/Editor.cs
+++ b/osu.Game/Screens/Edit/Editor.cs
@@ -215,6 +215,7 @@ namespace osu.Game.Screens.Edit
         private Bindable<bool> editorLimitedDistanceSnap;
         private Bindable<bool> editorTimelineShowTimingChanges;
         private Bindable<bool> editorTimelineShowTicks;
+        private Bindable<bool> editorTimelineShowSamples;
 
         /// <summary>
         /// This controls the opacity of components like the timelines, sidebars, etc.
@@ -323,6 +324,7 @@ namespace osu.Game.Screens.Edit
             editorLimitedDistanceSnap = config.GetBindable<bool>(OsuSetting.EditorLimitedDistanceSnap);
             editorTimelineShowTimingChanges = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTimingChanges);
             editorTimelineShowTicks = config.GetBindable<bool>(OsuSetting.EditorTimelineShowTicks);
+            editorTimelineShowSamples = config.GetBindable<bool>(OsuSetting.EditorTimelineShowSamples);
 
             AddInternal(new OsuContextMenuContainer
             {
@@ -388,6 +390,10 @@ namespace osu.Game.Screens.Edit
                                                     {
                                                         State = { BindTarget = editorTimelineShowTicks }
                                                     },
+                                                    new ToggleMenuItem(EditorStrings.TimelineShowSamples)
+                                                    {
+                                                        State = { BindTarget = editorTimelineShowSamples }
+                                                    }
                                                 ]
                                             },
                                             new BackgroundDimMenuItem(editorBackgroundDim),