From a549cdd5b9f1b8a968e9a3e5d57c926db22b8675 Mon Sep 17 00:00:00 2001
From: Sheppsu <apc2005osu@gmail.com>
Date: Tue, 3 Sep 2024 04:49:50 -0400
Subject: [PATCH] persist analysis settings

---
 .../UI/OsuAnalysisContainer.cs                | 27 ++++++++++++-------
 .../UI/OsuAnalysisSettings.cs                 | 10 +++++++
 osu.Game/Configuration/OsuConfigManager.cs    | 10 +++++++
 3 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/osu.Game.Rulesets.Osu/UI/OsuAnalysisContainer.cs b/osu.Game.Rulesets.Osu/UI/OsuAnalysisContainer.cs
index 2f341a35bb..4eff147772 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuAnalysisContainer.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuAnalysisContainer.cs
@@ -1,5 +1,4 @@
-
-// Copyright (c) ppy Pty Ltd <contact@ppy.sh>. Licensed under the MIT Licence.
+// 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;
@@ -38,28 +37,38 @@ namespace osu.Game.Rulesets.Osu.UI
                 HitMarkers = new HitMarkersContainer(),
                 AimMarkers = new AimMarkersContainer { Depth = float.MinValue }
             };
+
         }
 
         protected override OsuAnalysisSettings CreateAnalysisSettings()
         {
             var settings = new OsuAnalysisSettings();
-            settings.HitMarkersEnabled.ValueChanged += e => HitMarkers.FadeTo(e.NewValue ? 1 : 0);
-            settings.AimMarkersEnabled.ValueChanged += e => AimMarkers.FadeTo(e.NewValue ? 1 : 0);
-            settings.AimLinesEnabled.ValueChanged += e => AimLines.FadeTo(e.NewValue ? 1 : 0);
-            settings.CursorHideEnabled.ValueChanged += e => Playfield.Cursor.FadeTo(e.NewValue ? 0 : 1);
+            settings.HitMarkersEnabled.ValueChanged += e => toggleHitMarkers(e.NewValue);
+            settings.AimMarkersEnabled.ValueChanged += e => toggleAimMarkers(e.NewValue);
+            settings.AimLinesEnabled.ValueChanged += e => toggleAimLines(e.NewValue);
+            settings.CursorHideEnabled.ValueChanged += e => toggleCursorHidden(e.NewValue);
             return settings;
         }
 
         [BackgroundDependencyLoader]
         private void load()
         {
-            HitMarkers.Hide();
-            AimMarkers.Hide();
-            AimLines.Hide();
+            toggleHitMarkers(AnalysisSettings.HitMarkersEnabled.Value);
+            toggleAimMarkers(AnalysisSettings.AimMarkersEnabled.Value);
+            toggleAimLines(AnalysisSettings.AimLinesEnabled.Value);
+            toggleCursorHidden(AnalysisSettings.CursorHideEnabled.Value);
 
             LoadReplay();
         }
 
+        private void toggleHitMarkers(bool value) => HitMarkers.FadeTo(value ? 1 : 0);
+
+        private void toggleAimMarkers(bool value) => AimMarkers.FadeTo(value ? 1 : 0);
+
+        private void toggleAimLines(bool value) => AimLines.FadeTo(value ? 1 : 0);
+
+        private void toggleCursorHidden(bool value) => Playfield.Cursor.FadeTo(value ? 0 : 1);
+
         protected void LoadReplay()
         {
             bool leftHeld = false;
diff --git a/osu.Game.Rulesets.Osu/UI/OsuAnalysisSettings.cs b/osu.Game.Rulesets.Osu/UI/OsuAnalysisSettings.cs
index c45b893a1c..ae81b2c0b8 100644
--- a/osu.Game.Rulesets.Osu/UI/OsuAnalysisSettings.cs
+++ b/osu.Game.Rulesets.Osu/UI/OsuAnalysisSettings.cs
@@ -1,6 +1,7 @@
 // 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 osu.Framework.Allocation;
 using osu.Framework.Bindables;
 using osu.Game.Configuration;
 using osu.Game.Screens.Play.PlayerSettings;
@@ -20,5 +21,14 @@ namespace osu.Game.Rulesets.Osu.UI
 
         [SettingSource("Hide cursor", SettingControlType = typeof(PlayerCheckbox))]
         public BindableBool CursorHideEnabled { get; } = new BindableBool();
+
+        [BackgroundDependencyLoader]
+        private void load(OsuConfigManager config)
+        {
+            config.BindWith(OsuSetting.ReplayHitMarkersEnabled, HitMarkersEnabled);
+            config.BindWith(OsuSetting.ReplayAimMarkersEnabled, AimMarkersEnabled);
+            config.BindWith(OsuSetting.ReplayAimLinesEnabled, AimLinesEnabled);
+            config.BindWith(OsuSetting.ReplayCursorHideEnabled, CursorHideEnabled);
+        }
     }
 }
diff --git a/osu.Game/Configuration/OsuConfigManager.cs b/osu.Game/Configuration/OsuConfigManager.cs
index 8d6c244b35..8b75c9c934 100644
--- a/osu.Game/Configuration/OsuConfigManager.cs
+++ b/osu.Game/Configuration/OsuConfigManager.cs
@@ -154,6 +154,12 @@ namespace osu.Game.Configuration
             SetDefault(OsuSetting.IncreaseFirstObjectVisibility, true);
             SetDefault(OsuSetting.GameplayDisableWinKey, true);
 
+            // Replay
+            SetDefault(OsuSetting.ReplayHitMarkersEnabled, false);
+            SetDefault(OsuSetting.ReplayAimMarkersEnabled, false);
+            SetDefault(OsuSetting.ReplayAimLinesEnabled, false);
+            SetDefault(OsuSetting.ReplayCursorHideEnabled, false);
+
             // Update
             SetDefault(OsuSetting.ReleaseStream, ReleaseStream.Lazer);
 
@@ -413,6 +419,10 @@ namespace osu.Game.Configuration
         EditorShowHitMarkers,
         EditorAutoSeekOnPlacement,
         DiscordRichPresence,
+        ReplayHitMarkersEnabled,
+        ReplayAimMarkersEnabled,
+        ReplayAimLinesEnabled,
+        ReplayCursorHideEnabled,
 
         ShowOnlineExplicitContent,
         LastProcessedMetadataId,