Harden start menu handover

Author: srwi

EverythingToolbar/SearchWindow.xaml.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.Windows;
 using System.Windows.Input;
 using System.Windows.Interop;
@@ -27,6 +27,7 @@ public partial class SearchWindow
         public event EventHandler<ShowingEventArgs>? Showing;
 
         private bool _isFirstShow = true;
+        private bool _isHiding;
         private readonly SearchWindowViewModel _viewModel;
         private readonly SearchWindowController _controller;
         private readonly SearchWindowAnimator _animator;
@@ -83,14 +84,16 @@ private void OpenSearchInEverything(object? sender, RoutedEventArgs e)
 
         internal void Show(ShowOptions options)
         {
-            if (Visibility == Visibility.Visible)
+            if (Visibility == Visibility.Visible && !_isHiding)
             {
                 if (options.Activate)
                     ActivateAndBringToFront();
 
                 return;
             }
 
+            _isHiding = false;
+
             if (_isFirstShow)
                 PreWarm();
 
@@ -107,9 +110,10 @@ internal void Show(ShowOptions options)
 
         internal void HideAnimated()
         {
-            if (Visibility != Visibility.Visible)
+            if (Visibility != Visibility.Visible || _isHiding)
                 return;
 
+            _isHiding = true;
             Hiding?.Invoke(this, EventArgs.Empty);
         }
 
@@ -120,6 +124,7 @@ internal void FocusSearchBox()
 
         private void OnHidden()
         {
+            _isHiding = false;
             _viewModel.SavePopupSize((int)Width, (int)Height);
 
             // Push outside of screens to hide Windows' closing animation

EverythingToolbar/Services/StartMenuSearchInterceptor.cs

@@ -241,12 +241,10 @@ private void TriggerSearchWindow()
         private void ShowSearchUiForReplay()
         {
             if (_windowsPolicy.IsTaskbarWindowActive())
-            {
                 _controller.ShowStandalone();
-                return;
-            }
+            else
+                _controller.Show();
 
-            _controller.Show();
             _controller.FocusSearchBox();
         }
 
@@ -321,7 +319,6 @@ private void RestoreAnimations()
 
         private void HookStartMenuInput()
         {
-            UnhookStartMenuInput();
             _keyboardHook.Install();
         }