From 5cd8fa9d0b3f7f8b56cf27aec79d06c992a4d714 Mon Sep 17 00:00:00 2001
From: DB p <onesound@oooz.net>
Date: Sun, 21 Apr 2024 21:29:13 +0900
Subject: [PATCH] - Adjust Welcome Window's Hotkey Layout - Remove Comment in
 Card Control

---
 Flow.Launcher/Resources/Controls/Card.xaml    |  84 -----
 .../Resources/Controls/HotkeyDisplay.xaml     |  39 +-
 .../Resources/Controls/HotkeyDisplay.xaml.cs  |  11 +-
 .../Resources/Pages/WelcomePage3.xaml         | 355 ++++--------------
 Flow.Launcher/WelcomeWindow.xaml              |   4 +
 5 files changed, 115 insertions(+), 378 deletions(-)

diff --git a/Flow.Launcher/Resources/Controls/Card.xaml b/Flow.Launcher/Resources/Controls/Card.xaml
index 83449feb0..24a895485 100644
--- a/Flow.Launcher/Resources/Controls/Card.xaml
+++ b/Flow.Launcher/Resources/Controls/Card.xaml
@@ -114,88 +114,4 @@
             </Border>
         </ControlTemplate>
     </UserControl.Template>
-
-    <!--<Border Margin="0,8,0,0">
-            <Border.Style>
-                <Style TargetType="{x:Type Border}">
-                    <Setter Property="Background" Value="{DynamicResource Color00B}" />
-                    <Setter Property="BorderBrush" Value="{DynamicResource Color03B}" />
-                    <Setter Property="BorderThickness" Value="1" />
-                    <Setter Property="CornerRadius" Value="5" />
-                    <Setter Property="Margin" Value="0,5,0,0" />
-                    <Setter Property="Padding" Value="0,15,0,15" />
-                    <Setter Property="SnapsToDevicePixels" Value="True" />
-                </Style>
-            </Border.Style>
-            <ItemsControl>
-                <ItemsControl.Style>
-                    <Style TargetType="ItemsControl">
-                        <Setter Property="Focusable" Value="False" />
-                        <Setter Property="Margin" Value="0" />
-                        <Setter Property="ItemsPanel">
-                            <Setter.Value>
-                                <ItemsPanelTemplate>
-                                    <Grid>
-                                        <Grid.ColumnDefinitions>
-                                            <ColumnDefinition
-                                                Width="auto"
-                                                MinWidth="20"
-                                                MaxWidth="60" />
-                                            <ColumnDefinition Width="8*" />
-                                            <ColumnDefinition Width="Auto" MinWidth="30" />
-                                        </Grid.ColumnDefinitions>
-                                    </Grid>
-                                </ItemsPanelTemplate>
-                            </Setter.Value>
-                        </Setter>
-                    </Style>
-                </ItemsControl.Style>
-                <StackPanel>
-                    <StackPanel.Style>
-                        <Style TargetType="{x:Type StackPanel}">
-                            <Setter Property="Grid.Column" Value="1" />
-                            <Setter Property="Margin" Value="0,0,0,0" />
-                            <Setter Property="Width" Value="Auto" />
-                            <Setter Property="VerticalAlignment" Value="Center" />
-                            <Setter Property="HorizontalAlignment" Value="Left" />
-                        </Style>
-                    </StackPanel.Style>
-                    <TextBlock x:Name="ItemTitle" Text="{Binding Title, RelativeSource={RelativeSource AncestorType=local:Card}}">
-                        <TextBlock.Style>
-                            <Style TargetType="{x:Type TextBlock}">
-                                <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-                                <Setter Property="Margin" Value="0,0,0,0" />
-                                <Setter Property="TextWrapping" Value="Wrap" />
-                            </Style>
-                        </TextBlock.Style>
-                    </TextBlock>
-                    <TextBlock x:Name="SubTitle" Text="{Binding Sub, RelativeSource={RelativeSource AncestorType=local:Card}}">
-                        <TextBlock.Style>
-                            <Style TargetType="{x:Type TextBlock}">
-                                <Setter Property="Foreground" Value="{DynamicResource Color04B}" />
-                                <Setter Property="FontSize" Value="12" />
-                                <Setter Property="Margin" Value="0,0,0,0" />
-                                <Setter Property="Padding" Value="0,0,24,0" />
-                                <Setter Property="TextWrapping" Value="WrapWithOverflow" />
-                            </Style>
-                        </TextBlock.Style>
-                    </TextBlock>
-                </StackPanel>
-
-                <TextBlock Text="{Binding Icon, RelativeSource={RelativeSource AncestorType=local:Card}}">
-                    <TextBlock.Style>
-                        <Style TargetType="{x:Type TextBlock}">
-                            <Setter Property="Grid.Column" Value="0" />
-                            <Setter Property="Margin" Value="24,0,16,0" />
-                            <Setter Property="VerticalAlignment" Value="Center" />
-                            <Setter Property="FontSize" Value="20" />
-                            <Setter Property="FontFamily" Value="/Resources/#Segoe Fluent Icons" />
-                            <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
-                        </Style>
-                    </TextBlock.Style>
-                </TextBlock>
-
-            </ItemsControl>
-
-        </Border>-->
 </UserControl>
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
index 1fce67917..9fbbbc1eb 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml
@@ -19,11 +19,22 @@
                 <ControlTemplate TargetType="Button">
                     <Border
                         x:Name="ButtonBorder"
-                        Padding="5,0,5,0"
-                        Background="{DynamicResource Color12B}"
                         BorderBrush="{DynamicResource ButtonInsideBorder}"
-                        BorderThickness="1"
                         CornerRadius="5">
+                        <Border.Style>
+                            <Style TargetType="{x:Type Border}">
+                                <Setter Property="Background" Value="{DynamicResource Color12B}" />
+                                <Setter Property="Padding" Value="5,0,5,0" />
+                                <Setter Property="BorderThickness" Value="1" />
+                                <Style.Triggers>
+                                    <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
+                                        <Setter Property="Background" Value="Transparent" />
+                                        <Setter Property="Padding" Value="0,0,0,0" />
+                                        <Setter Property="BorderThickness" Value="0" />
+                                    </DataTrigger>
+                                </Style.Triggers>
+                            </Style>
+                        </Border.Style>
                         <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center" />
                     </Border>
                 </ControlTemplate>
@@ -37,12 +48,22 @@
                     </ItemsControl.ItemsPanel>
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Border
-                                Margin="2,5,2,5"
-                                Padding="10,5,10,5"
-                                Background="{DynamicResource SystemControlBackgroundBaseLowBrush}"
-                                BorderThickness="1"
-                                CornerRadius="5">
+                            <Border BorderThickness="1" CornerRadius="5">
+                                <Border.Style>
+                                    <Style TargetType="{x:Type Border}">
+                                        <Setter Property="Background" Value="{DynamicResource SystemControlBackgroundBaseLowBrush}" />
+                                        <Setter Property="Padding" Value="10,5,10,5" />
+                                        <Setter Property="Margin" Value="2,5,2,5" />
+                                        <Setter Property="BorderThickness" Value="1" />
+                                        <Style.Triggers>
+                                            <DataTrigger Binding="{Binding Type, RelativeSource={RelativeSource AncestorType=local:HotkeyDisplay}}" Value="Small">
+                                                <Setter Property="Background" Value="{DynamicResource AccentButtonBackground}" />
+                                                <Setter Property="Padding" Value="10,5,10,5" />
+                                                <Setter Property="Margin" Value="2,0,2,0" />
+                                            </DataTrigger>
+                                        </Style.Triggers>
+                                    </Style>
+                                </Border.Style>
                                 <TextBlock Foreground="{DynamicResource AccentButtonForegroundPointerOver}" Text="{Binding}" />
                             </Border>
                         </DataTemplate>
diff --git a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
index 7ffd90d5f..063966dc6 100644
--- a/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
+++ b/Flow.Launcher/Resources/Controls/HotkeyDisplay.xaml.cs
@@ -42,7 +42,16 @@ namespace Flow.Launcher.Resources.Controls
             DependencyProperty.Register("Keys", typeof(string), typeof(HotkeyDisplay),
                 new PropertyMetadata(string.Empty, keyChanged));
 
-        
+        public string Type
+        {
+            get { return (string)GetValue(TypeValueProperty); }
+            set { SetValue(TypeValueProperty, value); }
+        }
+
+        public static readonly DependencyProperty TypeValueProperty =
+            DependencyProperty.Register("Type", typeof(string), typeof(HotkeyDisplay),
+                new PropertyMetadata(null));
+
         private static void keyChanged(DependencyObject d, DependencyPropertyChangedEventArgs e)
         {
             var control = d as UserControl;
diff --git a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
index e7920d34e..a9e3fa696 100644
--- a/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
+++ b/Flow.Launcher/Resources/Pages/WelcomePage3.xaml
@@ -2,11 +2,13 @@
     x:Class="Flow.Launcher.Resources.Pages.WelcomePage3"
     xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:cc="clr-namespace:Flow.Launcher.Resources.Controls"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:local="clr-namespace:Flow.Launcher.Resources.Pages"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:ui="http://schemas.modernwpf.com/2019"
     Title="WelcomePage3"
+    VerticalAlignment="Stretch"
     mc:Ignorable="d">
     <Page.Resources>
         <Style x:Key="KbdLine" TargetType="Border">
@@ -27,301 +29,86 @@
             <Setter Property="Foreground" Value="{DynamicResource Color05B}" />
         </Style>
     </Page.Resources>
-    <ScrollViewer HorizontalScrollBarVisibility="Auto" VerticalScrollBarVisibility="Auto">
-        <Grid>
-            <Grid.RowDefinitions>
-                <RowDefinition Height="0" />
-                <RowDefinition />
-            </Grid.RowDefinitions>
-
-            <Border Grid.Row="0" HorizontalAlignment="Stretch">
-                <Border.Background>
-                    <LinearGradientBrush StartPoint="0 0" EndPoint="1 1">
-                        <LinearGradientBrush.GradientStops>
-                            <GradientStop Offset="0.0" Color="#16af7b" />
-                            <GradientStop Offset="1.0" Color="#34c191" />
-                        </LinearGradientBrush.GradientStops>
-                    </LinearGradientBrush>
-                </Border.Background>
-
-                <StackPanel HorizontalAlignment="Center" Orientation="Horizontal">
-                    <Image
-                        Width="300"
-                        Height="100"
-                        Margin="0,0,0,0"
-                        Source="../../images/page_img02.png"
-                        Style="{DynamicResource StyleImageFadeIn}" />
-                </StackPanel>
-            </Border>
-
-            <ScrollViewer
-                Grid.Row="1"
-                HorizontalScrollBarVisibility="Auto"
-                VerticalScrollBarVisibility="Auto">
-                <Grid>
-                    <StackPanel Margin="24,20,24,20">
-                        <StackPanel Margin="0,0,0,10">
-                            <TextBlock
-                                FontSize="20"
-                                FontWeight="SemiBold"
-                                Text="{DynamicResource Welcome_Page3_Title}" />
-                        </StackPanel>
-                        <Border Style="{DynamicResource KbdLine}">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto" />
+            <RowDefinition Height="*" />
+        </Grid.RowDefinitions>
+        <TextBlock
+            Grid.Row="0"
+            Margin="24,20,24,14"
+            FontSize="20"
+            FontWeight="SemiBold"
+            Text="{DynamicResource Welcome_Page3_Title}" />
+        <ScrollViewer
+            Grid.Row="1"
+            Height="478"
+            Margin="0,0,0,0"
+            HorizontalAlignment="Stretch"
+            FontSize="13">
+            <StackPanel Margin="24,0,24,0">
+                <Border
+                    BorderBrush="{DynamicResource Color03B}"
+                    BorderThickness="0"
+                    CornerRadius="5">
+                    <StackPanel>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyUpDownDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}">←</TextBlock>
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">,</TextBlock>
-                                    <Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}">→</TextBlock>
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyUpDownDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="←+→" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyLeftRightDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}">↑</TextBlock>
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">,</TextBlock>
-                                    <Border Margin="5,0,0,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}">↓</TextBlock>
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyLeftRightDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="↑+↓" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyESCDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}">Enter</TextBlock>
-                                    </Border>
-
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyRunDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="ESC" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyRunDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
+                            <cc:HotkeyDisplay Keys="ENTER" Type="Small" />
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyShiftEnterDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="ESC" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyESCDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="SHIFT+ENTER" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyCtrlEnterDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Tab" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyTabDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="CTRL+ENTER" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
+                        </cc:Card>
+                        <cc:Card
+                            Title="{DynamicResource HotkeyCtrlShiftEnterDesc}"
+                            BorderThickness="0,0,0,0"
+                            Type="Inside">
                             <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Shift" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyShiftEnterDesc}" />
-                                </StackPanel>
+                                <cc:HotkeyDisplay Keys="CTRL+SHIFT+ENTER" Type="Small" />
                             </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyCtrlEnterDesc}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Shift" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="ENTER" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyCtrlShiftEnterDesc}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="H" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyCtrlHDesc}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="Ctrl" />
-                                    </Border>
-                                    <TextBlock VerticalAlignment="Center">+</TextBlock>
-                                    <Border Margin="5,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="I" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyCtrlIDesc}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </Border>
-
-                        <Border Style="{DynamicResource KbdLine}">
-                            <StackPanel Orientation="Horizontal">
-                                <StackPanel
-                                    Width="210"
-                                    Margin="20,5,4,5"
-                                    VerticalAlignment="Center"
-                                    Orientation="Horizontal">
-                                    <Border Margin="0,0,5,0" Style="{DynamicResource Kbd}">
-                                        <TextBlock Style="{DynamicResource KbdText}" Text="F5" />
-                                    </Border>
-                                </StackPanel>
-                                <StackPanel VerticalAlignment="Center">
-                                    <TextBlock
-                                        VerticalAlignment="Center"
-                                        FontSize="13"
-                                        Text="{DynamicResource HotkeyF5Desc}" />
-                                </StackPanel>
-                            </StackPanel>
-                        </Border>
+                        </cc:Card>
                     </StackPanel>
-                </Grid>
-            </ScrollViewer>
-
-        </Grid>
-    </ScrollViewer>
+                </Border>
+            </StackPanel>
+        </ScrollViewer>
+    </Grid>
 </ui:Page>
diff --git a/Flow.Launcher/WelcomeWindow.xaml b/Flow.Launcher/WelcomeWindow.xaml
index c7820d436..003dac5bc 100644
--- a/Flow.Launcher/WelcomeWindow.xaml
+++ b/Flow.Launcher/WelcomeWindow.xaml
@@ -10,6 +10,10 @@
     Title="{DynamicResource Welcome_Page1_Title}"
     Width="550"
     Height="650"
+    MinWidth="550"
+    MinHeight="650"
+    MaxWidth="550"
+    MaxHeight="650"
     Activated="OnActivated"
     Background="{DynamicResource Color00B}"
     Foreground="{DynamicResource PopupTextColor}"