Fix setting window navigation update issue & Check view model null instead of IsInitialized flag

Jack251970 · Jack251970 · commit 57dccce1bf04 · 2025-05-15T18:35:57.000+08:00
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs
@@ -14,7 +14,7 @@ public partial class WelcomePage1
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (!IsInitialized)
+            if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs
@@ -16,7 +16,7 @@ public partial class WelcomePage2
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (!IsInitialized)
+            if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs
@@ -12,7 +12,7 @@ public partial class WelcomePage3
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (!IsInitialized)
+            if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs
@@ -12,7 +12,7 @@ public partial class WelcomePage4
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (!IsInitialized)
+            if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs
@@ -15,7 +15,7 @@ public partial class WelcomePage5
 
         protected override void OnNavigatedTo(NavigationEventArgs e)
         {
-            if (!IsInitialized)
+            if (_viewModel == null)
             {
                 Settings = Ioc.Default.GetRequiredService<Settings>();
                 _viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneAbout.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views;
 
 public partial class SettingsPaneAbout
 {
     private SettingsPaneAboutViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneAbout);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneGeneral.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views;
 
 public partial class SettingsPaneGeneral
 {
     private SettingsPaneGeneralViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneGeneralViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneGeneral);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneHotkey.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views;
 
 public partial class SettingsPaneHotkey
 {
     private SettingsPaneHotkeyViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneHotkeyViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneHotkey);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePluginStore.xaml.cs
@@ -11,16 +11,21 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPanePluginStore
 {
     private SettingsPanePluginStoreViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPanePluginStore);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPanePlugins.xaml.cs
@@ -11,16 +11,21 @@ namespace Flow.Launcher.SettingPages.Views;
 public partial class SettingsPanePlugins
 {
     private SettingsPanePluginsViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginsViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
         _viewModel.PropertyChanged += ViewModel_PropertyChanged;
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPanePlugins);
         base.OnNavigatedTo(e);
     }
 
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneProxy.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views;
 
 public partial class SettingsPaneProxy
 {
     private SettingsPaneProxyViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneProxyViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneProxy);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs b/Flow.Launcher/SettingPages/Views/SettingsPaneTheme.xaml.cs
@@ -1,21 +1,27 @@
 ﻿using System.Windows.Navigation;
 using CommunityToolkit.Mvvm.DependencyInjection;
 using Flow.Launcher.SettingPages.ViewModels;
+using Flow.Launcher.ViewModel;
 
 namespace Flow.Launcher.SettingPages.Views;
 
 public partial class SettingsPaneTheme
 {
     private SettingsPaneThemeViewModel _viewModel = null!;
+    private SettingWindowViewModel _settingViewModel = null;
 
     protected override void OnNavigatedTo(NavigationEventArgs e)
     {
-        if (!IsInitialized)
+        if (_viewModel == null)
         {
             _viewModel = Ioc.Default.GetRequiredService<SettingsPaneThemeViewModel>();
+            _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
             DataContext = _viewModel;
             InitializeComponent();
         }
+        // Sometimes the navigation is not triggered by button click,
+        // so we need to reset the page type
+        _settingViewModel.PageType = typeof(SettingsPaneTheme);
         base.OnNavigatedTo(e);
     }
 }
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
@@ -1,4 +1,5 @@
 ﻿using System;
+using System.ComponentModel;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Input;
@@ -18,6 +19,7 @@ public partial class SettingWindow
     #region Private Fields
 
     private readonly Settings _settings;
+    private readonly SettingWindowViewModel _viewModel;
 
     #endregion
 
@@ -26,8 +28,8 @@ public partial class SettingWindow
     public SettingWindow()
     {
         _settings = Ioc.Default.GetRequiredService<Settings>();
-        var viewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
-        DataContext = viewModel;
+        _viewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();
+        DataContext = _viewModel;
         InitializeComponent();
 
         UpdatePositionAndState();
@@ -48,10 +50,37 @@ private void OnLoaded(object sender, RoutedEventArgs e)
         hwndTarget.RenderMode = RenderMode.SoftwareOnly;  // Must use software only render mode here
 
         UpdatePositionAndState();
+
+        _viewModel.PropertyChanged += ViewModel_PropertyChanged;
+    }
+
+    // Sometimes the navigation is not triggered by button click,
+    // so we need to update the selected item here
+    private void ViewModel_PropertyChanged(object sender, PropertyChangedEventArgs e)
+    {
+        switch (e.PropertyName)
+        {
+            case nameof(SettingWindowViewModel.PageType):
+                var selectedIndex = _viewModel.PageType.Name switch
+                {
+                    nameof(SettingsPaneGeneral) => 0,
+                    nameof(SettingsPanePlugins) => 1,
+                    nameof(SettingsPanePluginStore) => 2,
+                    nameof(SettingsPaneTheme) => 3,
+                    nameof(SettingsPaneHotkey) => 4,
+                    nameof(SettingsPaneProxy) => 5,
+                    nameof(SettingsPaneAbout) => 6,
+                    _ => 0
+                };
+                NavView.SelectedItem = NavView.MenuItems[selectedIndex];
+                break;
+        }
     }
 
     private void OnClosed(object sender, EventArgs e)
     {
+        _viewModel.PropertyChanged -= ViewModel_PropertyChanged;
+
         // If app is exiting, settings save is not needed because main window closing event will handle this
         if (App.Exiting) return;
         // Save settings when window is closed
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -1,5 +1,7 @@
-﻿using Flow.Launcher.Infrastructure.UserSettings;
+﻿using System;
+using Flow.Launcher.Infrastructure.UserSettings;
 using Flow.Launcher.Plugin;
+using Flow.Launcher.SettingPages.Views;
 
 namespace Flow.Launcher.ViewModel;
 
@@ -12,6 +14,20 @@ public SettingWindowViewModel(Settings settings)
         _settings = settings;
     }
 
+    private Type _pageType = typeof(SettingsPaneGeneral);
+    public Type PageType
+    {
+        get => _pageType;
+        set
+        {
+            if (_pageType != value)
+            {
+                _pageType = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+
     public double SettingWindowWidth
     {
         get => _settings.SettingWindowWidth;

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ public partial class WelcomePage1`
`14`	`14`
`15`	`15`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`16`	`16`	`{`
`17`		`- if (!IsInitialized)`
	`17`	`+ if (_viewModel == null)`
`18`	`18`	`{`
`19`	`19`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`20`	`20`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,7 @@ public partial class WelcomePage2`
`16`	`16`
`17`	`17`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`18`	`18`	`{`
`19`		`- if (!IsInitialized)`
	`19`	`+ if (_viewModel == null)`
`20`	`20`	`{`
`21`	`21`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`22`	`22`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ public partial class WelcomePage3`
`12`	`12`
`13`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`14`	`14`	`{`
`15`		`- if (!IsInitialized)`
	`15`	`+ if (_viewModel == null)`
`16`	`16`	`{`
`17`	`17`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`18`	`18`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ public partial class WelcomePage5`
`15`	`15`
`16`	`16`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`17`	`17`	`{`
`18`		`- if (!IsInitialized)`
	`18`	`+ if (_viewModel == null)`
`19`	`19`	`{`
`20`	`20`	`Settings = Ioc.Default.GetRequiredService<Settings>();`
`21`	`21`	`_viewModel = Ioc.Default.GetRequiredService<WelcomeViewModel>();`
Original file line number	Diff line number	Diff line change
`@@ -1,21 +1,27 @@`
`1`	`1`	`using System.Windows.Navigation;`
`2`	`2`	`using CommunityToolkit.Mvvm.DependencyInjection;`
`3`	`3`	`using Flow.Launcher.SettingPages.ViewModels;`
	`4`	`+using Flow.Launcher.ViewModel;`
`4`	`5`
`5`	`6`	`namespace Flow.Launcher.SettingPages.Views;`
`6`	`7`
`7`	`8`	`public partial class SettingsPaneAbout`
`8`	`9`	`{`
`9`	`10`	`private SettingsPaneAboutViewModel _viewModel = null!;`
	`11`	`+ private SettingWindowViewModel _settingViewModel = null;`
`10`	`12`
`11`	`13`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`12`	`14`	`{`
`13`		`- if (!IsInitialized)`
	`15`	`+ if (_viewModel == null)`
`14`	`16`	`{`
`15`	`17`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPaneAboutViewModel>();`
	`18`	`+ _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`16`	`19`	`DataContext = _viewModel;`
`17`	`20`	`InitializeComponent();`
`18`	`21`	`}`
	`22`	`+ // Sometimes the navigation is not triggered by button click,`
	`23`	`+ // so we need to reset the page type`
	`24`	`+ _settingViewModel.PageType = typeof(SettingsPaneAbout);`
`19`	`25`	`base.OnNavigatedTo(e);`
`20`	`26`	`}`
`21`	`27`
Original file line number	Diff line number	Diff line change
`@@ -11,16 +11,21 @@ namespace Flow.Launcher.SettingPages.Views;`
`11`	`11`	`public partial class SettingsPanePluginStore`
`12`	`12`	`{`
`13`	`13`	`private SettingsPanePluginStoreViewModel _viewModel = null!;`
	`14`	`+ private SettingWindowViewModel _settingViewModel = null;`
`14`	`15`
`15`	`16`	`protected override void OnNavigatedTo(NavigationEventArgs e)`
`16`	`17`	`{`
`17`		`- if (!IsInitialized)`
	`18`	`+ if (_viewModel == null)`
`18`	`19`	`{`
`19`	`20`	`_viewModel = Ioc.Default.GetRequiredService<SettingsPanePluginStoreViewModel>();`
	`21`	`+ _settingViewModel = Ioc.Default.GetRequiredService<SettingWindowViewModel>();`
`20`	`22`	`DataContext = _viewModel;`
`21`	`23`	`InitializeComponent();`
`22`	`24`	`}`
`23`	`25`	`_viewModel.PropertyChanged += ViewModel_PropertyChanged;`
	`26`	`+ // Sometimes the navigation is not triggered by button click,`
	`27`	`+ // so we need to reset the page type`
	`28`	`+ _settingViewModel.PageType = typeof(SettingsPanePluginStore);`
`24`	`29`	`base.OnNavigatedTo(e);`
`25`	`30`	`}`
`26`	`31`