Merge

radioman · May 11, 2015 · 5dfb8d7 · 5dfb8d7
2 parents 8f3b90f + ea29b52
commit 5dfb8d7
Show file tree

Hide file tree

Showing 2 changed files with 21 additions and 0 deletions.
diff --git a/GMap.NET.Core/GMap.NET.Internals/Core.cs b/GMap.NET.Core/GMap.NET.Internals/Core.cs
@@ -35,6 +35,7 @@ internal class Core : IDisposable
       public GPoint mouseLastZoom;
 
       public MouseWheelZoomType MouseWheelZoomType = MouseWheelZoomType.MousePositionAndCenter;
+      public bool MouseWheelZoomEnabled = true;
 
       public PointLatLng? LastLocationInBounds = null;
       public bool VirtualSizeEnabled = false;

diff --git a/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs b/GMap.NET.WindowsForms/GMap.NET.WindowsForms/GMapControl.cs
@@ -138,6 +138,23 @@ public MouseWheelZoomType MouseWheelZoomType
         }
 
         /// <summary>
+      /// enable map zoom on mouse wheel
+      /// </summary>
+      [Category("GMap.NET")]
+      [Description("enable map zoom on mouse wheel")]
+      public bool MouseWheelZoomEnabled
+      {
+          get
+          {
+              return Core.MouseWheelZoomEnabled;
+          }
+          set
+          {
+              Core.MouseWheelZoomEnabled = value;
+          }
+      }
+
+      /// <summary>
         /// text on empty tiles
         /// </summary>
         public string EmptyTileText = "We are sorry, but we don't\nhave imagery at this zoom\nlevel for this region.";
@@ -2266,6 +2283,8 @@ protected override void OnMouseWheel(MouseEventArgs e)
         {
             base.OnMouseWheel(e);
 
+         if (MouseWheelZoomEnabled)
+         {
             if (mouseIn && (!IsMouseOverMarker || IgnoreMarkerOnMouseWheel) && !Core.IsDragging)
             {
                 if (Core.mouseLastZoom.X != e.X && Core.mouseLastZoom.Y != e.Y)
@@ -2323,6 +2342,7 @@ protected override void OnMouseWheel(MouseEventArgs e)
                 }
 
                 Core.MouseWheelZooming = false;
+             }
             }
         }
 #endif