Inertia – Diff between revs 3 and 5

Subversion Repositories:

?pathlinks?

Rev 3 – Go to most recent revision – Details – Blame – Last modification – View Log

             Settings.Default.SettingsSaving += DefaultOnSettingsSaving;
             Settings.Default.PropertyChanged += DefaultOnPropertyChanged;
+            _inputSimulator = new InputSimulator();
-            _inputSimulator = new InputSimulator();
+            _scrollCancellationTokenSource = new CancellationTokenSource();
             _globalMouseKeyHook = Hook.GlobalEvents();
             _globalMouseKeyHook.MouseWheel += GlobalMouseKeyHookMouseWheel;
         #region Private Methods
+        private static async void ScrollDown()
+        {
+            _scrollCancellationTokenSource.Cancel();
+            _scrollCancellationTokenSource = new CancellationTokenSource();
-        private static async void ScrollDown()
+            var cancellationToken = _scrollCancellationTokenSource.Token;
             var downDelta = Interlocked.Read(ref _downDelta);
             var delta = Math.Abs(downDelta / SystemInformation.MouseWheelScrollDelta);
-            Interlocked.Exchange(ref _downDelta, 0);
-            Debug.WriteLine($"Down event expired with delta {delta}");
-            if (_scrollCancellationTokenSource != null)
-            {
-                _scrollCancellationTokenSource.Cancel();
-            }
             Interlocked.Exchange(ref _downDelta, 0);
             _scrollCancellationTokenSource = new CancellationTokenSource();
-            var cancellationToken = _scrollCancellationTokenSource.Token;
+            Debug.WriteLine($"Down event expired with delta {delta}");
             _globalMouseKeyHook.MouseWheel -= GlobalMouseKeyHookMouseWheel;
             try
+            {
+            }
+        }
         private static async void ScrollUp()
+        {
+            _scrollCancellationTokenSource.Cancel();
+            _scrollCancellationTokenSource = new CancellationTokenSource();
+            var cancellationToken = _scrollCancellationTokenSource.Token;
             var upDelta = Interlocked.Read(ref _upDelta);
             var delta = Math.Abs(upDelta / SystemInformation.MouseWheelScrollDelta);
             Interlocked.Exchange(ref _upDelta, 0);
-            Debug.WriteLine($"Up event expired with delta {delta}");
-            if (_scrollCancellationTokenSource != null)
-            {
-                _scrollCancellationTokenSource.Cancel();
-            }
             _scrollCancellationTokenSource = new CancellationTokenSource();
-            var cancellationToken = _scrollCancellationTokenSource.Token;
+            Debug.WriteLine($"Up event expired with delta {delta}");
             _globalMouseKeyHook.MouseWheel -= GlobalMouseKeyHookMouseWheel;
+            }
+        }
         private static async Task ScrollUp(int delta, CancellationToken cancellationToken)
         {
-            while (!cancellationToken.IsCancellationRequested && delta > 0)
+            while (!cancellationToken.IsCancellationRequested && delta > 1)
+            {
                 _inputSimulator.Mouse.VerticalScroll(delta);
                 await Task.Delay(25 * delta, cancellationToken);
                 Debug.WriteLine($"Moving: {delta}");
                 delta = (int) Math.Log(delta, 2);
+            }
+        }
         private static async Task ScrollDown(int delta, CancellationToken cancellationToken)
+        {
-            while (!cancellationToken.IsCancellationRequested && delta > 0)
+            while (!cancellationToken.IsCancellationRequested && delta > 1)
+            {
                 _inputSimulator.Mouse.VerticalScroll(-delta);
                 await Task.Delay(25 * delta, cancellationToken);