Option for legacy mouse scroll behavior

kaczy93 · Feb 19, 2024 · b11317c · b11317c
1 parent fa3729e
commit b11317c
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/CentrED/Config.cs b/CentrED/Config.cs
@@ -8,6 +8,7 @@ public class ConfigRoot
     public string ActiveProfile = "";
     public string ServerConfigPath = "cedserver.xml";
     public bool PreferTexMaps;
+    public bool LegacyMouseScroll;
     public Dictionary<string, WindowState> Layout = new();
 }
 

diff --git a/CentrED/Map/MapManager.cs b/CentrED/Map/MapManager.cs
@@ -435,12 +435,20 @@ public void Update(GameTime gameTime, bool isActive, bool processMouse, bool pro
             return;
         Metrics.Start("UpdateMap");
         var mouseState = Mouse.GetState();
+        var keyState = Keyboard.GetState();
         if (isActive && processMouse)
         {
             if (mouseState.ScrollWheelValue != _prevMouseState.ScrollWheelValue)
             {
                 var delta = (mouseState.ScrollWheelValue - _prevMouseState.ScrollWheelValue) / 1200f;
-                Camera.ZoomIn(delta);
+                if(Config.Instance.LegacyMouseScroll ^ (keyState.IsKeyDown(Keys.LeftControl) || keyState.IsKeyDown(Keys.RightControl)))
+                {
+                    if (Selected != null)
+                        Selected.Tile.Z += (sbyte)(delta * 10);
+                }
+                else {
+                    Camera.ZoomIn(delta);
+                }
             }
             if (mouseState.RightButton == ButtonState.Pressed)
             {
@@ -494,7 +502,6 @@ public void Update(GameTime gameTime, bool isActive, bool processMouse, bool pro
 
         if (isActive && processKeyboard)
         {
-            var keyState = Keyboard.GetState();
             var delta = keyState.IsKeyDown(Keys.LeftShift) ? 30 : 10;
 
             foreach (var key in keyState.GetPressedKeys())

diff --git a/CentrED/UI/Windows/OptionsWindow.cs b/CentrED/UI/Windows/OptionsWindow.cs
@@ -28,6 +28,8 @@ protected override void InternalDraw()
                 {
                     CEDGame.MapManager.Reset();
                 }
+                ImGui.Checkbox("Legacy mouse scroll behavior", ref Config.Instance.LegacyMouseScroll);
+                UIManager.Tooltip("Mouse scroll up/down: elevate tile\nCtrl + Mouse scroll up/down: Zoom in/out");
                 ImGui.EndTabItem();
             }
             if (ImGui.BeginTabItem("Virtual Layer"))