Fix: ProfileFilterPopup with focus window

Author: BornToBeRoot

Source/NETworkManager/ViewModels/AWSSessionManagerHostViewModel.cs

@@ -599,6 +599,8 @@ public ICommand TextBoxSearchLostFocusCommand
 
     private void OpenProfileFilterAction()
     {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = true;
+        
         ProfileFilterIsOpen = true;
     }
 
@@ -1183,6 +1185,11 @@ private void RefreshProfiles()
         IsProfileFilterSet = !string.IsNullOrEmpty(filter.Search) || filter.Tags.Any();
     }
 
+    public void OnProfileFilterClosed()
+    {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = false;
+    }
+    
     public void OnProfileManagerDialogOpen()
     {
         ConfigurationManager.OnDialogOpen();

Source/NETworkManager/ViewModels/PuTTYHostViewModel.cs

@@ -503,6 +503,8 @@ public ICommand TextBoxSearchLostFocusCommand
 
     private void OpenProfileFilterAction()
     {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = true;
+        
         ProfileFilterIsOpen = true;
     }
 
@@ -901,6 +903,11 @@ private void RefreshProfiles()
         IsProfileFilterSet = !string.IsNullOrEmpty(filter.Search) || filter.Tags.Any();
     }
 
+    public void OnProfileFilterClosed()
+    {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = false;
+    }
+    
     public void OnProfileManagerDialogOpen()
     {
         ConfigurationManager.OnDialogOpen();

Source/NETworkManager/Views/AWSSessionManagerHostView.xaml

@@ -402,6 +402,7 @@
                             </Button>
                             <Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}"
                                    Placement="Bottom" StaysOpen="False"
+                                   Closed="PopupProfileFilter_Closed"
                                    IsOpen="{Binding ProfileFilterIsOpen}"
                                    Width="220">
                                 <Border Background="{DynamicResource MahApps.Brushes.Window.Background}"

Source/NETworkManager/Views/AWSSessionManagerHostView.xaml.cs

@@ -1,4 +1,5 @@
-using System.Windows;
+using System;
+using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
 using MahApps.Metro.Controls.Dialogs;
@@ -54,4 +55,9 @@ public void FocusEmbeddedWindow()
     {
         _viewModel.FocusEmbeddedWindow();
     }
+
+    private void PopupProfileFilter_Closed(object sender, EventArgs e)
+    {
+        _viewModel.OnProfileFilterClosed();
+    }
 }

Source/NETworkManager/Views/PuTTYHostView.xaml

@@ -373,6 +373,7 @@
                             </Button>
                             <Popup PlacementTarget="{Binding ElementName=ButtonProfileFilter}"
                                    Placement="Bottom" StaysOpen="False"
+                                   Closed="PopupProfileFilter_Closed"
                                    IsOpen="{Binding ProfileFilterIsOpen}"
                                    Width="220">
                                 <Border Background="{DynamicResource MahApps.Brushes.Window.Background}"

Source/NETworkManager/Views/PuTTYHostView.xaml.cs

@@ -1,4 +1,5 @@
-using System.Threading.Tasks;
+using System;
+using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -61,4 +62,9 @@ public void FocusEmbeddedWindow()
     {
         _viewModel.FocusEmbeddedWindow();
     }
+
+    private void PopupProfileFilter_Closed(object sender, EventArgs e)
+    {
+        _viewModel.OnProfileFilterClosed();
+    }
 }