Skip to content

Commit 219e003

Browse files
committed
Adjust Welcome Window Size and text overflow
1 parent 3fef743 commit 219e003

File tree

5 files changed

+17
-17
lines changed

5 files changed

+17
-17
lines changed

Flow.Launcher/Resources/Pages/WelcomePage1.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -103,7 +103,7 @@
103103
<Grid>
104104
<Grid.RowDefinitions>
105105
<RowDefinition Height="250" />
106-
<RowDefinition />
106+
<RowDefinition Height="340"/>
107107
</Grid.RowDefinitions>
108108

109109
<Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -140,7 +140,7 @@
140140
</Border>
141141

142142

143-
<Canvas Grid.Row="1" Height="288">
143+
<Canvas Grid.Row="1" Height="338">
144144
<Image
145145
Name="wizard"
146146
Canvas.Right="30"
@@ -156,7 +156,7 @@
156156
<TextBlock
157157
FontSize="20"
158158
FontWeight="SemiBold"
159-
Text="{DynamicResource Welcome_Page1_Title}" />
159+
Text="{DynamicResource Welcome_Page1_Title}" TextWrapping="WrapWithOverflow"/>
160160
<TextBlock
161161
Margin="0 10 24 0"
162162
FontSize="14"

Flow.Launcher/Resources/Pages/WelcomePage2.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<Grid>
3939
<Grid.RowDefinitions>
4040
<RowDefinition Height="250" />
41-
<RowDefinition />
41+
<RowDefinition Height="340"/>
4242
</Grid.RowDefinitions>
4343

4444
<Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -89,12 +89,12 @@
8989
</StackPanel>
9090
</Border>
9191

92-
<StackPanel Grid.Row="1" Margin="24 20 24 20">
93-
<StackPanel>
92+
<ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Visible">
93+
<StackPanel Margin="24 20 24 20">
9494
<TextBlock
9595
FontSize="20"
9696
FontWeight="SemiBold"
97-
Text="{DynamicResource Welcome_Page2_Title}" />
97+
Text="{DynamicResource Welcome_Page2_Title}" TextWrapping="WrapWithOverflow"/>
9898
<TextBlock
9999
Margin="0 10 0 0"
100100
FontSize="14"
@@ -119,7 +119,7 @@
119119
WindowTitle="{DynamicResource flowlauncherHotkey}" />
120120
</StackPanel>
121121

122-
</StackPanel>
122+
</ScrollViewer>
123123
</Grid>
124124
</ScrollViewer>
125125
</ui:Page>

Flow.Launcher/Resources/Pages/WelcomePage4.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@
9393
<TextBlock
9494
FontSize="20"
9595
FontWeight="SemiBold"
96-
Text="{DynamicResource Welcome_Page4_Title}" />
96+
Text="{DynamicResource Welcome_Page4_Title}" TextWrapping="WrapWithOverflow"/>
9797
<TextBlock
9898
Margin="0 10 0 10"
9999
FontSize="14"

Flow.Launcher/Resources/Pages/WelcomePage5.xaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
<Grid>
5454
<Grid.RowDefinitions>
5555
<RowDefinition Height="250" />
56-
<RowDefinition />
56+
<RowDefinition Height="340"/>
5757
</Grid.RowDefinitions>
5858

5959
<Border Grid.Row="0" HorizontalAlignment="Stretch">
@@ -79,18 +79,18 @@
7979
</StackPanel>
8080
</Border>
8181

82-
<StackPanel Grid.Row="1" Margin="24 20 24 20">
82+
<StackPanel Grid.Row="1" Margin="24 20 24 20" >
8383
<StackPanel>
8484
<TextBlock
8585
FontSize="20"
8686
FontWeight="SemiBold"
87-
Text="{DynamicResource Welcome_Page5_Title}" />
87+
Text="{DynamicResource Welcome_Page5_Title}" TextWrapping="WrapWithOverflow"/>
8888
<TextBlock
8989
Margin="0 10 0 0"
9090
FontSize="14"
9191
Text="{DynamicResource Welcome_Page5_Text01}"
9292
TextWrapping="WrapWithOverflow" />
93-
<StackPanel Margin="0 30 0 0" Orientation="Horizontal">
93+
<StackPanel Margin="0 20 0 0" Orientation="Horizontal">
9494
<CheckBox
9595
Checked="OnAutoStartupChecked"
9696
Content="{DynamicResource startFlowLauncherOnSystemStartup}"
@@ -109,7 +109,7 @@
109109
<Button
110110
Width="150"
111111
Height="40"
112-
Margin="0 60 0 0"
112+
Margin="0 102 0 0"
113113
HorizontalAlignment="Right"
114114
Click="BtnCancel_OnClick"
115115
Content="{DynamicResource done}"

Flow.Launcher/WelcomeWindow.xaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,11 +10,11 @@
1010
Name="FlowWelcomeWindow"
1111
Title="{DynamicResource Welcome_Page1_Title}"
1212
Width="550"
13-
Height="650"
13+
Height="700"
1414
MinWidth="550"
15-
MinHeight="650"
15+
MinHeight="700"
1616
MaxWidth="550"
17-
MaxHeight="650"
17+
MaxHeight="700"
1818
d:DataContext="{d:DesignInstance Type=vm:WelcomeViewModel}"
1919
Activated="OnActivated"
2020
Background="{DynamicResource Color00B}"

0 commit comments

Comments
 (0)