From 219e00334f1b963033e9d0750dbca6d38df833f7 Mon Sep 17 00:00:00 2001
From: DB P <onesound@oooz.net>
Date: Mon, 9 Jun 2025 12:11:34 +0900
Subject: [PATCH] Adjust Welcome Window Size and text overflow

---
 Flow.Launcher/Resources/Pages/WelcomePage1.xaml |  6 +++---
 Flow.Launcher/Resources/Pages/WelcomePage2.xaml | 10 +++++-----
 Flow.Launcher/Resources/Pages/WelcomePage4.xaml |  2 +-
 Flow.Launcher/Resources/Pages/WelcomePage5.xaml | 10 +++++-----
 Flow.Launcher/WelcomeWindow.xaml                |  6 +++---
 5 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
index b6a99d9e9..ea651d4ee 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage1.xaml
@@ -103,7 +103,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -140,7 +140,7 @@
             </Border>
 
 
-            <Canvas Grid.Row="1" Height="288">
+            <Canvas Grid.Row="1" Height="338">
                 <Image
                     Name="wizard"
                     Canvas.Right="30"
@@ -156,7 +156,7 @@
                         <TextBlock
                             FontSize="20"
                             FontWeight="SemiBold"
-                            Text="{DynamicResource Welcome_Page1_Title}" />
+                            Text="{DynamicResource Welcome_Page1_Title}" TextWrapping="WrapWithOverflow"/>
                         <TextBlock
                             Margin="0 10 24 0"
                             FontSize="14"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
index ca00091f5..cf0dff9ab 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage2.xaml
@@ -38,7 +38,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -89,12 +89,12 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24 20 24 20">
-                <StackPanel>
+            <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
+                <StackPanel  Margin="24 20 24 20">
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page2_Title}" />
+                        Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 0"
                         FontSize="14"
@@ -119,7 +119,7 @@
                         WindowTitle="{DynamicResource flowlauncherHotkey}" />
                 </StackPanel>
 
-            </StackPanel>
+            </ScrollViewer>
         </Grid>
     </ScrollViewer>
 </ui:Page>
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
index e57718775..c319d7c6e 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage4.xaml
@@ -93,7 +93,7 @@
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page4_Title}" />
+                        Text="{DynamicResource Welcome_Page4_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 10"
                         FontSize="14"
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
index 7495231ae..997f724b9 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage5.xaml
@@ -53,7 +53,7 @@
         <Grid>
             <Grid.RowDefinitions>
                 <RowDefinition Height="250" />
-                <RowDefinition />
+                <RowDefinition Height="340"/>
             </Grid.RowDefinitions>
 
             <Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -79,18 +79,18 @@
                 </StackPanel>
             </Border>
 
-            <StackPanel Grid.Row="1" Margin="24 20 24 20">
+            <StackPanel Grid.Row="1" Margin="24 20 24 20" >
                 <StackPanel>
                     <TextBlock
                         FontSize="20"
                         FontWeight="SemiBold"
-                        Text="{DynamicResource Welcome_Page5_Title}" />
+                        Text="{DynamicResource Welcome_Page5_Title}" TextWrapping="WrapWithOverflow"/>
                     <TextBlock
                         Margin="0 10 0 0"
                         FontSize="14"
                         Text="{DynamicResource Welcome_Page5_Text01}"
                         TextWrapping="WrapWithOverflow" />
-                    <StackPanel Margin="0 30 0 0" Orientation="Horizontal">
+                    <StackPanel Margin="0 20 0 0" Orientation="Horizontal">
                         <CheckBox
                             Checked="OnAutoStartupChecked"
                             Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@@ -109,7 +109,7 @@
                     <Button
                         Width="150"
                         Height="40"
-                        Margin="0 60 0 0"
+                        Margin="0 102 0 0"
                         HorizontalAlignment="Right"
                         Click="BtnCancel_OnClick"
                         Content="{DynamicResource done}"
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index 5d91db749..f008827da 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -10,11 +10,11 @@
     Name="FlowWelcomeWindow"
     Title="{DynamicResource Welcome_Page1_Title}"
     Width="550"
-    Height="650"
+    Height="700"
     MinWidth="550"
-    MinHeight="650"
+    MinHeight="700"
     MaxWidth="550"
-    MaxHeight="650"
+    MaxHeight="700"
     d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
     Activated="OnActivated"
     Background="{DynamicResource Color00B}"