switch by arrow keys and by mouse click should repel each other

Author: xupefei

QuickLook/ViewWindowManager.cs

@@ -17,7 +17,6 @@ internal class ViewWindowManager : IDisposable
         private readonly MainWindowNoTransparent _viewWindowNoTransparent;
         private readonly MainWindowTransparent _viewWindowTransparentTransparent;
         private MainWindowTransparent _currentMainWindow;
-        private long _lastSwitchTick;
 
         private string _path = string.Empty;
 
@@ -99,8 +98,6 @@ internal void ClosePreview()
 
         private void TogglePreview()
         {
-            _lastSwitchTick = DateTime.Now.Ticks;
-
             if (_currentMainWindow.Visibility == Visibility.Visible)
             {
                 ClosePreview();
@@ -117,23 +114,25 @@ private void SwitchPreview()
             if (_currentMainWindow.Visibility != Visibility.Visible)
                 return;
 
-            _lastSwitchTick = DateTime.Now.Ticks;
+            // if the switch has been done by SwitchPreviewRemoteInvoke, we'll not do anything
+            var select = NativeMethods.QuickLook.GetCurrentSelection();
+            if (_path == select)
+                return;
+
+            _path = select;
 
-            _path = NativeMethods.QuickLook.GetCurrentSelection();
+            Debug.WriteLine($"SwitchPreview: {_path}");
 
             InvokeViewer();
         }
 
         private void SwitchPreviewRemoteInvoke(HeartbeatEventArgs e)
         {
-            // sleep for 0.6s
-            if (e.InvokeTick - _lastSwitchTick < 0.6 * TimeSpan.TicksPerSecond)
-                return;
-
+            // if the switch has been done by SwitchPreview, we'll not do anything
             if (e.FocusedFile == _path)
                 return;
 
-            Debug.WriteLine("SwitchPreviewRemoteInvoke:" + (e.InvokeTick - _lastSwitchTick));
+            Debug.WriteLine($"SwitchPreviewRemoteInvoke: {e.FocusedFile}");
 
             if (string.IsNullOrEmpty(e.FocusedFile))
                 return;