Mouse wheel control only with Alt – Followup for #1051

Author: pzgulyas

Source/RunActivity/Viewer3D/Cameras.cs

@@ -270,7 +270,7 @@ protected void ZoomByMouseWheel(float speed)
         {
             // Will not zoom-in-out when help windows is up.
             // TODO: Property input processing through WindowManager.
-            if (UserInput.IsMouseWheelChanged && !Viewer.HelpWindow.Visible && !Viewer.RenderProcess.IsMouseVisible)
+            if (UserInput.IsMouseWheelChanged && (!UserInput.IsDown(UserCommand.GameSwitchWithMouse) || !(this is ThreeDimCabCamera)) && !Viewer.HelpWindow.Visible)
             {
                 var fieldOfView = MathHelper.Clamp(FieldOfView - speed * UserInput.MouseWheelChange / 10, 1, 135);
                 new FieldOfViewCommand(Viewer.Log, fieldOfView);

Source/RunActivity/Viewer3D/RollingStock/MSTSLocomotiveViewer.cs

@@ -2340,9 +2340,10 @@ public virtual int GetDrawIndex()
         /// </summary>
         float NormalizedMouseMovement()
         {
+            var mouseWheelChange = (UserInput.IsDown(UserCommand.GameSwitchWithMouse) ? UserInput.MouseWheelChange : 0) / 10;
             return (ControlDiscrete.Orientation > 0
-                ? (float)(UserInput.MouseMoveY + UserInput.MouseWheelChange) / (float)Control.Height
-                : (float)(UserInput.MouseMoveX + UserInput.MouseWheelChange) / (float)Control.Width)
+                ? (float)(UserInput.MouseMoveY + mouseWheelChange) / (float)Control.Height
+                : (float)(UserInput.MouseMoveX + mouseWheelChange) / (float)Control.Width)
                 * (ControlDiscrete.Direction > 0 ? -1 : 1);
         }