Fix: Focus issue if profile filter is open

Author: BornToBeRoot

Source/NETworkManager.Settings/ConfigurationInfo.cs

@@ -451,6 +451,27 @@ public bool IsChildWindowOpen
         }
     }
 
+    /// <summary>
+    /// Private variable for <see cref="IsProfileFilterPopupOpen" />.
+    /// </summary>
+    private bool _isProfileFilterPopupOpen;
+
+    /// <summary>
+    /// Indicates if a profile filter popup is open.
+    /// </summary>
+    public bool IsProfileFilterPopupOpen
+    {
+        get => _isProfileFilterPopupOpen;
+        set
+        {
+            if (value == _isProfileFilterPopupOpen)
+                return;
+
+            _isProfileFilterPopupOpen = value;
+            OnPropertyChanged();
+        }
+    }
+
     /// <summary>
     ///     Private variable for <see cref="FixAirspace" />.
     /// </summary>

Source/NETworkManager/MainWindow.xaml.cs

@@ -1443,7 +1443,7 @@ private async void LoadProfile(ProfileFileInfo info, bool showWrongPassword = fa
             }, info.Name, showWrongPassword);
 
             childWindow.Title = Strings.UnlockProfileFile;
-            
+
             childWindow.DataContext = viewModel;
 
             ConfigurationManager.OnDialogOpen();
@@ -2004,10 +2004,16 @@ private async void FocusEmbeddedWindow()
            - Settings are opened
            - Profile file DropDown is opened
            - Application search TextBox is opened
+           - Profile filter (tags) popup is opened
            - Dialog over an embedded window is opened (FixAirspace)
         */
-        if (SelectedApplication == null || SettingsViewIsOpen || IsProfileFileDropDownOpened ||
+        if (SelectedApplication == null ||
+            // MainWindow
+            SettingsViewIsOpen ||
+            IsProfileFileDropDownOpened ||
             TextBoxApplicationSearchIsFocused ||
+            // Global dialogs
+            ConfigurationManager.Current.IsProfileFilterPopupOpen ||
             ConfigurationManager.Current.FixAirspace)
             return;
 

Source/NETworkManager/ViewModels/PowerShellHostViewModel.cs

@@ -233,10 +233,10 @@ public bool IsProfileFilterSet
             OnPropertyChanged();
         }
     }
-    
+
     private readonly GroupExpanderStateStore _groupExpanderStateStore = new();
     public GroupExpanderStateStore GroupExpanderStateStore => _groupExpanderStateStore;
-    
+
     private bool _canProfileWidthChange = true;
     private double _tempProfileWidth;
 
@@ -492,6 +492,8 @@ private void ClearSearchAction()
 
     private void OpenProfileFilterAction()
     {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = true;
+
         ProfileFilterIsOpen = true;
     }
 
@@ -517,7 +519,7 @@ private void ClearProfileFilterAction()
         IsProfileFilterSet = false;
         ProfileFilterIsOpen = false;
     }
-    
+
     public ICommand ExpandAllProfileGroupsCommand => new RelayCommand(_ => ExpandAllProfileGroupsAction());
 
     private void ExpandAllProfileGroupsAction()
@@ -531,7 +533,7 @@ private void CollapseAllProfileGroupsAction()
     {
         SetIsExpandedForAllProfileGroups(false);
     }
-    
+
     public ICommand OpenSettingsCommand => new RelayCommand(_ => OpenSettingsAction());
 
     private static void OpenSettingsAction()
@@ -674,7 +676,7 @@ private void SetIsExpandedForAllProfileGroups(bool isExpanded)
         foreach (var group in Profiles.Groups.Cast<CollectionViewGroup>())
             GroupExpanderStateStore[group.Name.ToString()] = isExpanded;
     }
-    
+
     private void ResizeProfile(bool dueToChangedSize)
     {
         _canProfileWidthChange = false;
@@ -766,7 +768,7 @@ private void CreateTags()
             ProfileFilterTags.Add(new ProfileFilterTagsInfo(false, tag));
         }
     }
-    
+
     private void SetProfilesView(ProfileFilterInfo filter, ProfileInfo profile = null)
     {
         Profiles = new CollectionViewSource
@@ -809,6 +811,11 @@ private void RefreshProfiles()
         }, SelectedProfile);
     }
 
+    public void OnProfileFilterClosed()
+    {
+        ConfigurationManager.Current.IsProfileFilterPopupOpen = false;
+    }
+
     public void OnProfileManagerDialogOpen()
     {
         ConfigurationManager.OnDialogOpen();
@@ -841,7 +848,7 @@ private void WriteDefaultProfileToRegistry()
     private void ProfileManager_OnProfilesUpdated(object sender, EventArgs e)
     {
         CreateTags();
-        
+
         RefreshProfiles();
     }
 

Source/NETworkManager/Views/PowerShellHostView.xaml

@@ -360,6 +360,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/PowerShellHostView.xaml.cs

@@ -61,4 +61,9 @@ public void FocusEmbeddedWindow()
     {
         _viewModel.FocusEmbeddedWindow();
     }
-}
+
+    private void PopupProfileFilter_Closed(object sender, System.EventArgs e)
+    {
+        _viewModel.OnProfileFilterClosed();
+    }
+}