Remove hide sample toggle

In line with feedback from #29896 (comment).
ppy · Nov 1, 2024 · 8f48682 · 8f48682
1 parent eb61da4
commit 8f48682
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 18 deletions.
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
@@ -205,7 +205,6 @@ protected override void InitialiseDefaults()
 
             SetDefault(OsuSetting.EditorTimelineShowTimingChanges, true);
             SetDefault(OsuSetting.EditorTimelineShowTicks, true);
-            SetDefault(OsuSetting.EditorTimelineShowSamples, true);
 
             SetDefault(OsuSetting.AlwaysShowHoldForMenuButton, false);
         }
@@ -433,6 +432,5 @@ public enum OsuSetting
         EditorTimelineShowTimingChanges,
         EditorTimelineShowTicks,
         AlwaysShowHoldForMenuButton,
-        EditorTimelineShowSamples
     }
 }
diff --git a/osu.Game/Localisation/EditorStrings.cs b/osu.Game/Localisation/EditorStrings.cs
@@ -139,11 +139,6 @@ public static class EditorStrings
         /// </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
@@ -44,8 +44,6 @@ public partial class SamplePointPiece : HitObjectPointPiece, IHasPopover
         [Resolved]
         private TimelineBlueprintContainer? timelineBlueprintContainer { get; set; }
 
-        private Bindable<bool> samplesVisible = null!;
-
         public SamplePointPiece(HitObject hitObject)
         {
             HitObject = hitObject;
@@ -68,8 +66,6 @@ private void load(OsuConfigManager config)
 
             if (editor != null)
                 editor.ShowSampleEditPopoverRequested += onShowSampleEditPopoverRequested;
-
-            samplesVisible = config.GetBindable<bool>(OsuSetting.EditorTimelineShowSamples);
         }
 
         private readonly Bindable<bool> contracted = new Bindable<bool>();
@@ -97,7 +93,6 @@ protected override void LoadComplete()
                 }
             }, true);
 
-            samplesVisible.BindValueChanged(visible => this.FadeTo(visible.NewValue ? 1 : 0, 200, Easing.OutQuint), true);
             FinishTransforms();
         }
 

diff --git a/osu.Game/Screens/Edit/Editor.cs b/osu.Game/Screens/Edit/Editor.cs
@@ -215,7 +215,6 @@ protected override IReadOnlyDependencyContainer CreateChildDependencies(IReadOnl
         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.
@@ -324,7 +323,6 @@ private void load(OsuConfigManager config)
             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
             {
@@ -390,10 +388,6 @@ private void load(OsuConfigManager config)
                                                     {
                                                         State = { BindTarget = editorTimelineShowTicks }
                                                     },
-                                                    new ToggleMenuItem(EditorStrings.TimelineShowSamples)
-                                                    {
-                                                        State = { BindTarget = editorTimelineShowSamples }
-                                                    }
                                                 ]
                                             },
                                             new BackgroundDimMenuItem(editorBackgroundDim),