Merge branch 'WelcomeWindow' of github.com:onesounds/Flow.Launcher into pr/849

 Conflicts:
	Flow.Launcher/WelcomeWindow.xaml.cs
This commit is contained in:
Kevin Zhang 2021-12-02 14:09:21 -06:00
commit 610e9de921
4 changed files with 4 additions and 1 deletions

View file

@ -27,7 +27,7 @@ namespace Flow.Launcher.Resources.Pages
/// <summary>
/// WelcomePage1.xaml에 대한 상호 작용 논리
/// </summary>
public partial class WelcomePage1 : Page
public partial class WelcomePage1
{
private bool initialize = false;

View file

@ -6,6 +6,7 @@
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage3"
mc:Ignorable="d">
<Page.Resources>

View file

@ -6,6 +6,7 @@
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
Title="WelcomePage4"
d:DesignHeight="450"
d:DesignWidth="800"

View file

@ -6,6 +6,7 @@
xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:ui="http://schemas.modernwpf.com/2019"
xmlns:userSettings="clr-namespace:Flow.Launcher.Infrastructure.UserSettings;assembly=Flow.Launcher.Infrastructure"
Title="WelcomePage5"
d:DesignHeight="450"