From 6b6b0faadfcdda46d213e107f9eb17fe50b65843 Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Thu, 21 Nov 2024 22:07:35 +0800
Subject: [PATCH 1/2] fix possible content frame navigation issue

---
 Flow.Launcher/SettingWindow.xaml    |  1 +
 Flow.Launcher/SettingWindow.xaml.cs | 24 ++++++++++++++++++++++--
 Flow.Launcher/WelcomeWindow.xaml    | 15 ++++++++-------
 Flow.Launcher/WelcomeWindow.xaml.cs |  9 +++++++--
 4 files changed, 38 insertions(+), 11 deletions(-)

diff --git a/Flow.Launcher/SettingWindow.xaml b/Flow.Launcher/SettingWindow.xaml
index f6381b46586..a81d9e0d108 100644
--- a/Flow.Launcher/SettingWindow.xaml
+++ b/Flow.Launcher/SettingWindow.xaml
@@ -171,6 +171,7 @@
                     IsPaneToggleButtonVisible="False"
                     IsSettingsVisible="False"
                     IsTabStop="False"
+                    Loaded="NavView_Loaded"
                     OpenPaneLength="240"
                     PaneDisplayMode="Left"
                     SelectionChanged="NavigationView_SelectionChanged">
diff --git a/Flow.Launcher/SettingWindow.xaml.cs b/Flow.Launcher/SettingWindow.xaml.cs
index 4cc125fa4af..cb3f1e4a113 100644
--- a/Flow.Launcher/SettingWindow.xaml.cs
+++ b/Flow.Launcher/SettingWindow.xaml.cs
@@ -29,7 +29,6 @@ public SettingWindow(IPublicAPI api, SettingWindowViewModel viewModel)
         _api = api;
         InitializePosition();
         InitializeComponent();
-        NavView.SelectedItem = NavView.MenuItems[0]; /* Set First Page */
     }
 
     private void OnLoaded(object sender, RoutedEventArgs e)
@@ -169,7 +168,11 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
         else
         {
             var selectedItem = (NavigationViewItem)args.SelectedItem;
-            if (selectedItem == null) return;
+            if (selectedItem == null)
+            {
+                NavView_Loaded(sender, null); /* Reset First Page */
+                return;
+            }
 
             var pageType = selectedItem.Name switch
             {
@@ -186,5 +189,22 @@ private void NavigationView_SelectionChanged(NavigationView sender, NavigationVi
         }
     }
 
+    private void NavView_Loaded(object sender, RoutedEventArgs e)
+    {
+        if (ContentFrame.IsLoaded)
+        {
+            ContentFrame_Loaded(sender, e);
+        }
+        else
+        {
+            ContentFrame.Loaded += ContentFrame_Loaded;
+        }
+    }
+
+    private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
+    {
+        NavView.SelectedItem ??= NavView.MenuItems[0]; /* Set First Page */
+    }
+
     public record PaneData(Settings Settings, Updater Updater, IPortable Portable);
 }
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 003dac5bcd8..d8cb38149a8 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -43,12 +43,12 @@
                         Grid.Column="0"
                         Width="16"
                         Height="16"
-                        Margin="10,4,4,4"
+                        Margin="10 4 4 4"
                         RenderOptions.BitmapScalingMode="HighQuality"
                         Source="/Images/app.png" />
                     <TextBlock
                         Grid.Column="1"
-                        Margin="4,0,0,0"
+                        Margin="4 0 0 0"
                         VerticalAlignment="Center"
                         FontSize="12"
                         Foreground="{DynamicResource Color05B}"
@@ -82,6 +82,7 @@
                 <ui:Frame
                     x:Name="ContentFrame"
                     HorizontalAlignment="Stretch"
+                    Loaded="ContentFrame_Loaded"
                     ScrollViewer.CanContentScroll="True"
                     ScrollViewer.HorizontalScrollBarVisibility="Visible"
                     ScrollViewer.VerticalScrollBarVisibility="Visible">
@@ -97,7 +98,7 @@
             Grid.Row="1"
             Background="{DynamicResource Color00B}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0,1,0,0">
+            BorderThickness="0 1 0 0">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="130" />
@@ -111,7 +112,7 @@
                     VerticalAlignment="Center">
                     <TextBlock
                         Name="PageNavigation"
-                        Margin="0,2,0,0"
+                        Margin="0 2 0 0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -124,20 +125,20 @@
                     Grid.Column="0"
                     Width="100"
                     Height="40"
-                    Margin="20,5,0,5"
+                    Margin="20 5 0 5"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource Skip}"
                     DockPanel.Dock="Right"
                     FontSize="14" />
                 <DockPanel
                     Grid.Column="2"
-                    Margin="0,0,20,0"
+                    Margin="0 0 20 0"
                     VerticalAlignment="Stretch">
                     <Button
                         x:Name="NextButton"
                         Width="40"
                         Height="40"
-                        Margin="8,5,0,5"
+                        Margin="8 5 0 5"
                         Click="ForwardButton_Click"
                         Content="&#xe76c;"
                         DockPanel.Dock="Right"
diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs
index eaa9938727d..c3723a8c529 100644
--- a/Flow.Launcher/WelcomeWindow.xaml.cs
+++ b/Flow.Launcher/WelcomeWindow.xaml.cs
@@ -17,7 +17,6 @@ public WelcomeWindow(Settings settings)
             InitializeComponent();
             BackButton.IsEnabled = false;
             this.settings = settings;
-            ContentFrame.Navigate(PageTypeSelector(1), settings);
         }
 
         private NavigationTransitionInfo _transitionInfo = new SlideNavigationTransitionInfo()
@@ -102,9 +101,15 @@ private static Type PageTypeSelector(int pageNumber)
             var tRequest = new TraversalRequest(FocusNavigationDirection.Next);
             textBox.MoveFocus(tRequest);
         }
+
         private void OnActivated(object sender, EventArgs e)
         {
             Keyboard.ClearFocus();
         }
+
+        private void ContentFrame_Loaded(object sender, RoutedEventArgs e)
+        {
+            ContentFrame.Navigate(PageTypeSelector(1), settings); /* Set First Page */
+        }
     }
-}
\ No newline at end of file
+}

From 929e7d6aa0654c0a83a0c1b550616c9d614ae03e Mon Sep 17 00:00:00 2001
From: Jack251970 <1160210343@qq.com>
Date: Fri, 22 Nov 2024 09:26:12 +0800
Subject: [PATCH 2/2] Revert xaml style in welcome window.

---
 Flow.Launcher/WelcomeWindow.xaml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index d8cb38149a8..208fc807fd9 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -43,12 +43,12 @@
                         Grid.Column="0"
                         Width="16"
                         Height="16"
-                        Margin="10 4 4 4"
+                        Margin="10,4,4,4"
                         RenderOptions.BitmapScalingMode="HighQuality"
                         Source="/Images/app.png" />
                     <TextBlock
                         Grid.Column="1"
-                        Margin="4 0 0 0"
+                        Margin="4,0,0,0"
                         VerticalAlignment="Center"
                         FontSize="12"
                         Foreground="{DynamicResource Color05B}"
@@ -98,7 +98,7 @@
             Grid.Row="1"
             Background="{DynamicResource Color00B}"
             BorderBrush="{DynamicResource PopupButtonAreaBorderColor}"
-            BorderThickness="0 1 0 0">
+            BorderThickness="0,1,0,0">
             <Grid>
                 <Grid.ColumnDefinitions>
                     <ColumnDefinition Width="130" />
@@ -112,7 +112,7 @@
                     VerticalAlignment="Center">
                     <TextBlock
                         Name="PageNavigation"
-                        Margin="0 2 0 0"
+                        Margin="0,2,0,0"
                         HorizontalAlignment="Center"
                         VerticalAlignment="Center"
                         FontSize="14"
@@ -125,20 +125,20 @@
                     Grid.Column="0"
                     Width="100"
                     Height="40"
-                    Margin="20 5 0 5"
+                    Margin="20,5,0,5"
                     Click="BtnCancel_OnClick"
                     Content="{DynamicResource Skip}"
                     DockPanel.Dock="Right"
                     FontSize="14" />
                 <DockPanel
                     Grid.Column="2"
-                    Margin="0 0 20 0"
+                    Margin="0,0,20,0"
                     VerticalAlignment="Stretch">
                     <Button
                         x:Name="NextButton"
                         Width="40"
                         Height="40"
-                        Margin="8 5 0 5"
+                        Margin="8,5,0,5"
                         Click="ForwardButton_Click"
                         Content="&#xe76c;"
                         DockPanel.Dock="Right"