diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml index a7882568d..7010225f0 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml +++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml @@ -1,10 +1,11 @@ - @@ -148,4 +149,4 @@ - + diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs index 9cf1c53a7..5eb971c12 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml.cs @@ -25,7 +25,7 @@ namespace Flow.Launcher.Resources.Pages /// /// WelcomePage1.xaml에 대한 상호 작용 논리 /// - public partial class WelcomePage1 : Page + public partial class WelcomePage1 { public WelcomePage1(Settings settings) diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml index f3202fd24..f8b30093b 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml +++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml @@ -1,4 +1,4 @@ - - + diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs index ed606c6c7..7c4b225d7 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml.cs @@ -20,7 +20,7 @@ namespace Flow.Launcher.Resources.Pages /// /// WelcomePage2.xaml에 대한 상호 작용 논리 /// - public partial class WelcomePage2 : Page + public partial class WelcomePage2 { private readonly Settings settings; diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml index 97e431dc9..cb39ff31c 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml +++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml @@ -1,10 +1,11 @@ - @@ -303,4 +304,4 @@ - + diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs index 39c260b54..83b19379b 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml.cs @@ -17,7 +17,7 @@ using System.Windows.Shapes; namespace Flow.Launcher.Resources.Pages { - public partial class WelcomePage3 : Page + public partial class WelcomePage3 { public WelcomePage3() { diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml index e2062dcf2..2511d9770 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml +++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml @@ -1,10 +1,11 @@ - - + diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs index cd1a988a2..62b36f83f 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml.cs @@ -18,7 +18,7 @@ namespace Flow.Launcher.Resources.Pages /// /// WelcomePage4.xaml에 대한 상호 작용 논리 /// - public partial class WelcomePage4 : Page + public partial class WelcomePage4 { public WelcomePage4() { diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml index 39090f81d..c898ac9a0 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml +++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml @@ -1,10 +1,11 @@ - - + diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs index 8a6a7d5c4..ebf8d96bd 100644 --- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs +++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml.cs @@ -21,7 +21,7 @@ using Flow.Launcher.ViewModel; namespace Flow.Launcher.Resources.Pages { - public partial class WelcomePage5 : Page + public partial class WelcomePage5 { private const string StartupPath = "SOFTWARE\\Microsoft\\Windows\\CurrentVersion\\Run"; private readonly Settings settings; diff --git a/Flow.Launcher/WelcomeWindow.xaml.cs b/Flow.Launcher/WelcomeWindow.xaml.cs index 49406fbaa..1f21d63ff 100644 --- a/Flow.Launcher/WelcomeWindow.xaml.cs +++ b/Flow.Launcher/WelcomeWindow.xaml.cs @@ -83,7 +83,8 @@ namespace Flow.Launcher { page--; UpdateView(); - ContentFrame.GoBack(); + var pageToNavigateTo = pages[page]; + ContentFrame.Navigate(pageToNavigateTo, _transitionInfo); } else {