Merge pull request #95 from Freeze7x/main

Editor invert scrolling toggle
InventiveRhythm · Oct 24, 2024 · 28470f1 · 28470f1
2 parents a8a2db3 + af63ddb
commit 28470f1
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 2 deletions.
diff --git a/fluXis.Game/Configuration/FluXisConfig.cs b/fluXis.Game/Configuration/FluXisConfig.cs
@@ -69,6 +69,7 @@ protected override void InitialiseDefaults()
         SetDefault(FluXisSetting.EditorDim, 0.4f, 0f, .8f, 0.2f);
         SetDefault(FluXisSetting.EditorBlur, 0f, 0f, 1f, 0.2f);
         SetDefault(FluXisSetting.EditorShowSamples, false);
+        SetDefault(FluXisSetting.InvertScroll, false);
 
         // Audio
         SetDefault(FluXisSetting.InactiveVolume, 0.5d, 0d, 1d, 0.01d);
@@ -155,6 +156,7 @@ public enum FluXisSetting
     EditorDim,
     EditorBlur,
     EditorShowSamples,
+    InvertScroll,
 
     // Audio
     InactiveVolume,

diff --git a/fluXis.Game/Screens/Edit/Editor.cs b/fluXis.Game/Screens/Edit/Editor.cs
@@ -191,7 +191,8 @@ private void load(AudioManager audioManager, Storage storage, FluXisConfig confi
         dependencies.CacheAs(actionStack = new EditorActionStack(editorMap) { NotificationManager = notifications });
         dependencies.CacheAs(settings = new EditorSettings
         {
-            ShowSamples = config.GetBindable<bool>(FluXisSetting.EditorShowSamples)
+            ShowSamples = config.GetBindable<bool>(FluXisSetting.EditorShowSamples),
+            InvertedScroll = config.GetBindable<bool>(FluXisSetting.InvertScroll)
         });
 
         updateStateHash();
@@ -358,7 +359,10 @@ private void load(AudioManager audioManager, Storage storage, FluXisConfig confi
                                             },
                                             new FluXisMenuSpacer(),
                                             new("Show sample on notes", FontAwesome6.Solid.LayerGroup, () => settings.ShowSamples.Value = !settings.ShowSamples.Value)
-                                                { IsActive = () => settings.ShowSamples.Value }
+                                                { IsActive = () => settings.ShowSamples.Value },
+                                            new FluXisMenuSpacer(),
+                                            new("Invert scroll direction", FontAwesome6.Solid.UpDown, () => settings.InvertedScroll.Value = !settings.InvertedScroll.Value)
+                                                { IsActive = () => settings.InvertedScroll.Value }
                                         }
                                     },
                                     new("Timing", FontAwesome6.Solid.Clock)

diff --git a/fluXis.Game/Screens/Edit/EditorSettings.cs b/fluXis.Game/Screens/Edit/EditorSettings.cs
@@ -21,6 +21,7 @@ public int SnapDivisor
     public BindableBool FlashUnderlay { get; } = new();
     public BindableColour4 FlashUnderlayColor { get; } = new(FluXisColors.Background1);
     public Bindable<bool> ShowSamples { get; init; }
+    public Bindable<bool> InvertedScroll { get; init; }
 
     public BindableFloat ZoomBindable { get; } = new(2f)
     {

diff --git a/fluXis.Game/Screens/Edit/Tabs/Shared/EditorTabContainer.cs b/fluXis.Game/Screens/Edit/Tabs/Shared/EditorTabContainer.cs
@@ -130,6 +130,7 @@ protected override bool OnScroll(ScrollEvent e)
             scrollAccumulation = delta * (1 - Math.Abs(scrollAccumulation));
 
         scrollAccumulation += e.ScrollDelta.Y;
+        scrollAccumulation *= Settings.InvertedScroll.Value ? -1 : 1;
 
         while (Math.Abs(scrollAccumulation) >= 1)
         {