merge

1 files changed, 0 insertions, 32 deletions

diff --git a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs
index a20f52d7b..934c22295 100644
--- a/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs
+++ b/Software/Visual_Studio/Tango.Touch/Controls/LightTouchScrollViewer.cs
@@ -668,39 +668,7 @@ namespace Tango.Touch.Controls
                 IsScrolling = false;
             }
         }
-        /// <summary>
-        /// Invoked when an unhandled <see cref="E:System.Windows.Input.Mouse.MouseWheel" /> attached event reaches an element in its route that is derived from this class. Implement this method to add class handling for this event.
-        /// </summary>
-        /// <param name="e">The <see cref="T:System.Windows.Input.MouseWheelEventArgs" /> that contains the event data.</param>
-        protected override void OnMouseWheel( MouseWheelEventArgs e)
-        {
-            base.OnMouseWheel(e);
-            if (DisableScrolling)
-            {
-                return;
-            }
-            base.OnMouseWheel(e);
 
-            if (!e.Handled )
-            {
-                if (e.Delta != 0)
-                {
-                    var scrollPos = GetScrollPosition();
-                    if (e.Delta > 0)
-                    {
-                        scrollPos -= 15;
-                    }
-                    else if(e.Delta < 0)
-                    {
-                        scrollPos += 15;
-                    }
-                    ScrollToPosition(scrollPos);
-                    SetThumbPosition();
-                }
-            }
-
-            e.Handled = false;
-        }
         #endregion
 
         #region Private Methods