adapt ca85609 from MAO

Author: TimtyG

Intersect.Client.Core/Core/Input.cs

@@ -37,22 +37,33 @@ public static partial class Input
 
     public static HandleKeyEvent? MouseUp { get => _mouseUp; set => _mouseUp = value; }
 
-    private static void HandleZoomOut()
+    public static void HandleZoomOut(bool wrap = true)
     {
-        Globals.Database.WorldZoom /= 2;
-        if (Globals.Database.WorldZoom < Graphics.MinimumWorldScale)
+        var nextZoom = Globals.Database.WorldZoom / 2;
+        if (nextZoom < Graphics.MinimumWorldScale)
         {
-            Globals.Database.WorldZoom = Graphics.MaximumWorldScale;
+            if (wrap)
+            {
+                Globals.Database.WorldZoom = Graphics.MaximumWorldScale;
+            }
+            return;
         }
+
+        Globals.Database.WorldZoom = nextZoom;
     }
 
-    private static void HandleZoomIn()
+    public static void HandleZoomIn(bool wrap = true)
     {
-        Globals.Database.WorldZoom *= 2;
-        if (Globals.Database.WorldZoom > Graphics.MaximumWorldScale)
+        var nextZoom = Globals.Database.WorldZoom * 2;
+        if (nextZoom > Graphics.MaximumWorldScale)
         {
-            Globals.Database.WorldZoom = Graphics.MinimumWorldScale;
+            if (wrap)
+            {
+                Globals.Database.WorldZoom = Graphics.MinimumWorldScale;
+            }
+            return;
         }
+        Globals.Database.WorldZoom = nextZoom;
     }
 
     public static void OnKeyPressed(Keys modifier, Keys key)

Intersect.Client.Core/Interface/Shared/SettingsWindow.cs

@@ -78,6 +78,7 @@ public partial class SettingsWindow : Window
     private readonly LabeledSlider _worldScale;
     private readonly LabeledCheckBox _fullscreenCheckbox;
     private readonly LabeledCheckBox _lightingEnabledCheckbox;
+    public readonly LabeledCheckBox _enableMouseScrollZoomCheckbox;
     private MenuItem? _customResolutionMenuItem;
 
     // Audio Settings
@@ -422,6 +423,14 @@ public SettingsWindow(Base parent) : base(parent: parent, title: Strings.Setting
             Text = Strings.Settings.EnableLighting,
         };
 
+        // Video Settings - Enable Mouse Scroll Zoom Checkbox
+        _enableMouseScrollZoomCheckbox = new LabeledCheckBox(parent: _videoContainer, name: nameof(_enableMouseScrollZoomCheckbox))
+        {
+            Dock = Pos.Top,
+            Font = _defaultFont,
+            Text = Strings.Settings.EnableMouseScrollZoom,
+        };
+
         _worldScale = new LabeledSlider(parent: _videoContainer, name: nameof(_worldScale))
         {
             Dock = Pos.Top,
@@ -929,6 +938,7 @@ public void Show(Base? returnTo)
         // Video Settings.
         _fullscreenCheckbox.IsChecked = Globals.Database.FullScreen;
         _lightingEnabledCheckbox.IsChecked = Globals.Database.EnableLighting;
+        _enableMouseScrollZoomCheckbox.IsChecked = Globals.Database.EnableMouseScrollZoom;
 
         // _uiScale.Value = Globals.Database.UIScale;
 
@@ -1114,6 +1124,8 @@ private void SettingsApplyBtn_Clicked(Base sender, MouseButtonState arguments)
 
         Globals.Database.EnableLighting = _lightingEnabledCheckbox.IsChecked;
 
+        Globals.Database.EnableMouseScrollZoom = _enableMouseScrollZoomCheckbox.IsChecked;
+
         if (targetResolution > -1)
         {
             shouldReset = Globals.Database.TargetResolution != targetResolution || Graphics.Renderer?.HasOverrideResolution == true;

Intersect.Client.Core/Localization/Strings.cs

@@ -2089,6 +2089,9 @@ public partial struct Settings
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public static LocalizedString EnableLighting = @"Enable Light Effects";
 
+        [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
+        public static LocalizedString EnableMouseScrollZoom = @"Enable Mouse Scroll Zoom";
+
         [JsonProperty(NullValueHandling = NullValueHandling.Ignore)]
         public static LocalizedString FormatResolution = @"{00}x{01}";
 

Intersect.Client.Core/MonoGame/Input/MonoInput.cs

@@ -237,6 +237,9 @@ private void CheckMouseButton(Keys modifier, ButtonState bs, MouseButton mb)
         }
     }
 
+    private const double ZoomDelayInMilliseconds = 300;
+    private DateTime _lastZoomTime = DateTime.MinValue;
+
     private void CheckMouseScrollWheel(int scrlVValue, int scrlHValue)
     {
         Pointf p = new Pointf(0, 0);
@@ -249,6 +252,27 @@ private void CheckMouseScrollWheel(int scrlVValue, int scrlHValue)
                 new GwenInputMessage(IntersectInput.InputEvent.MouseScroll, p, MouseButton.Middle, Keys.Alt)
             );
 
+            var deltaV = Math.Sign(mMouseVScroll - scrlVValue);
+
+            if ((DateTime.Now - _lastZoomTime).TotalMilliseconds >= ZoomDelayInMilliseconds)
+
+            {
+
+                if ((InputHandler.HoveredControl == null || !InputHandler.HoveredControl.IsVisible)
+                  && Globals.GameState == GameStates.InGame
+                  && Globals.Database.EnableMouseScrollZoom)
+            {
+                if (deltaV < 0)
+                {
+                    Core.Input.HandleZoomIn(false);
+                }
+                else
+                {
+                    Core.Input.HandleZoomOut(false);
+                }
+                    _lastZoomTime = DateTime.Now;
+                }
+            }
             mMouseVScroll = scrlVValue;
             mMouseHScroll = scrlHValue;
         }

Intersect.Client.Framework/Database/GameDatabase.cs

@@ -27,6 +27,8 @@ public abstract partial class GameDatabase
 
     public bool EnableLighting { get; set; }
 
+    public bool EnableMouseScrollZoom { get; set; }
+
     public bool StickyTarget { get; set; }
 
     public bool AutoTurnToTarget { get; set; }
@@ -119,6 +121,7 @@ public virtual void LoadPreferences()
         TargetFps = LoadPreference(nameof(TargetFps), 0);
         FullScreen = LoadPreference(nameof(FullScreen), false);
         EnableLighting = LoadPreference(nameof(EnableLighting), true);
+        EnableMouseScrollZoom = LoadPreference(nameof(EnableMouseScrollZoom), false);
         HideOthersOnWindowOpen = LoadPreference(nameof(HideOthersOnWindowOpen), true);
         AutoToggleChatLog = LoadPreference(nameof(AutoToggleChatLog), false);
         TargetAccountDirection = LoadPreference(nameof(TargetAccountDirection), false);
@@ -158,6 +161,7 @@ public virtual void SavePreferences()
         SavePreference(nameof(FullScreen), FullScreen);
         SavePreference(nameof(ShowFPSCounter), ShowFPSCounter);
         SavePreference(nameof(EnableLighting), EnableLighting);
+        SavePreference(nameof(EnableMouseScrollZoom), EnableMouseScrollZoom);
         SavePreference(nameof(HideOthersOnWindowOpen), HideOthersOnWindowOpen);
         SavePreference(nameof(AutoToggleChatLog), AutoToggleChatLog);
         SavePreference(nameof(TargetAccountDirection), TargetAccountDirection);