From b134876f8b3b0d9c5a09542b4b5c27ac6c130e25 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 15 Sep 2021 10:23:21 +0800
Subject: [PATCH] style<Welcome>: optimize layouts when there's no data in tree
 or list

---
 src/Resources/Icons.xaml          |  1 +
 src/Resources/Locales/en_US.xaml  |  4 +--
 src/Resources/Locales/zh_CN.xaml  |  2 +-
 src/Views/Widgets/Welcome.xaml    | 48 ++++++++++++++++++++++---------
 src/Views/Widgets/Welcome.xaml.cs | 12 ++++++++
 5 files changed, 51 insertions(+), 16 deletions(-)

diff --git a/src/Resources/Icons.xaml b/src/Resources/Icons.xaml
index bcb0857d..5528939c 100644
--- a/src/Resources/Icons.xaml
+++ b/src/Resources/Icons.xaml
@@ -72,4 +72,5 @@
     <Geometry x:Key="Icon.Tag.Add">M683 537h-144v-142h-142V283H239a44 44 0 00-41 41v171a56 56 0 0014 34l321 321a41 41 0 0058 0l174-174a41 41 0 000-58zm-341-109a41 41 0 110-58a41 41 0 010 58zM649 284V142h-69v142h-142v68h142v142h69v-142h142v-68h-142z</Geometry>
 
     <Geometry x:Key="Icon.VSCode">M719 85 388 417l-209-165L87 299v427l92 47 210-164L720 939 939 850V171zM186 610V412l104 104zm526 55L514 512l198-153z</Geometry>
+    <Geometry x:Key="Icon.DragDrop">M597 256h85v85h213a43 43 0 0143 43v320L683 555l2 344 95-92L855 939H384a43 43 0 01-43-43v-213H256v-85h85V384a43 43 0 0143-43h213V256zm341 484V896a43 43 0 01-2 13l-84-145L939 740zM171 597v85H85v-85h85zm0-171v85H85v-85h85zm0-171v85H85V256h85zm0-171v85H85V85h85zm171 0v85H256V85h85zm171 0v85h-85V85h85zm171 0v85h-85V85h85z</Geometry>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Resources/Locales/en_US.xaml b/src/Resources/Locales/en_US.xaml
index adc447c2..7d49337c 100644
--- a/src/Resources/Locales/en_US.xaml
+++ b/src/Resources/Locales/en_US.xaml
@@ -296,11 +296,11 @@
     <sys:String x:Key="Text.Merge.Into">Into :</sys:String>
     <sys:String x:Key="Text.Merge.Mode">Merge Option :</sys:String>
 
-    <sys:String x:Key="Text.Welcome.Title">SourceGit</sys:String>
+    <sys:String x:Key="Text.Welcome.Title">Free &amp; open source GUI for git users</sys:String>
     <sys:String x:Key="Text.Welcome.OpenOrInit">Open local repository</sys:String>
     <sys:String x:Key="Text.Welcome.OpenTerminal">Open terminal</sys:String>
     <sys:String x:Key="Text.Welcome.Clone">Clone remote repository</sys:String>
-    <sys:String x:Key="Text.Welcome.DragDrop">DRAG-DROP YOUR FOLDER</sys:String>
+    <sys:String x:Key="Text.Welcome.DragDrop">DROP FOLDER HERE</sys:String>
     <sys:String x:Key="Text.Welcome.Start">START</sys:String>
     <sys:String x:Key="Text.Welcome.Recent">RECENT OPENED</sys:String>
     <sys:String x:Key="Text.Welcome.Repositories">REPOSITORIES</sys:String>
diff --git a/src/Resources/Locales/zh_CN.xaml b/src/Resources/Locales/zh_CN.xaml
index 5bc498af..22688414 100644
--- a/src/Resources/Locales/zh_CN.xaml
+++ b/src/Resources/Locales/zh_CN.xaml
@@ -295,7 +295,7 @@
     <sys:String x:Key="Text.Merge.Into">目标分支 ：</sys:String>
     <sys:String x:Key="Text.Merge.Mode">合并方式 ：</sys:String>
 
-    <sys:String x:Key="Text.Welcome.Title">欢迎使用本软件</sys:String>
+    <sys:String x:Key="Text.Welcome.Title">开源的轻量级Git图形客户端</sys:String>
     <sys:String x:Key="Text.Welcome.OpenOrInit">打开本地仓库</sys:String>
     <sys:String x:Key="Text.Welcome.OpenTerminal">打开GIT终端</sys:String>
     <sys:String x:Key="Text.Welcome.Clone">克隆远程仓库</sys:String>
diff --git a/src/Views/Widgets/Welcome.xaml b/src/Views/Widgets/Welcome.xaml
index 2eca856f..b0cbb6b0 100644
--- a/src/Views/Widgets/Welcome.xaml
+++ b/src/Views/Widgets/Welcome.xaml
@@ -9,8 +9,9 @@
              d:DesignHeight="800" d:DesignWidth="800">
     <Grid Background="Transparent" AllowDrop="True" DragEnter="OnPageDragEnter" DragLeave="OnPageDragLeave" Drop="OnPageDrop">
         <Grid.RowDefinitions>
-            <RowDefinition Height="100"/>
             <RowDefinition Height="80"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
@@ -20,17 +21,27 @@
             <ColumnDefinition Width="*"/>
         </Grid.ColumnDefinitions>
 
-        <!-- Page Title -->
+        <!-- App Name -->
         <TextBlock
             Grid.Row="1"
             Grid.Column="1"
             HorizontalAlignment="Left"
-            Text="{DynamicResource Text.Welcome.Title}"
+            Text="SourceGit"
             FontSize="28pt"
             TextOptions.TextFormattingMode="Ideal"
             TextOptions.TextRenderingMode="ClearType"/>
+        
+        <!-- App Desc -->
+        <TextBlock
+            Grid.Row="2"
+            Grid.Column="1"
+            HorizontalAlignment="Left"
+            Text="{DynamicResource Text.Welcome.Title}"
+            Foreground="{DynamicResource Brush.FG2}"
+            FontSize="20pt"
+            Margin="0,8"/>
 
-        <Grid x:Name="body" Grid.Row="2" Grid.Column="1" Margin="0,32" FocusManager.IsFocusScope="True">
+        <Grid x:Name="body" Grid.Row="3" Grid.Column="1" Margin="0,40,0,80" FocusManager.IsFocusScope="True">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="*"/>
                 <ColumnDefinition Width="16"/>
@@ -75,8 +86,10 @@
                 <!-- Recents -->
                 <TextBlock
                     Grid.Row="2" Margin="0,32,0,0"
+                    x:Name="lblRecent"
                     Text="{DynamicResource Text.Welcome.Recent}"
-                    FontSize="13pt"/>
+                    FontSize="13pt"
+                    Visibility="Hidden"/>
                 <DataGrid
                     Grid.Row="3"
                     x:Name="list"
@@ -132,18 +145,27 @@
                 </Grid.RowDefinitions>
 
                 <!-- Repositories Label -->
-                <Grid Grid.Row="0">
-                    <TextBlock
-                        Text="{DynamicResource Text.Welcome.Repositories}"
-                        FontSize="13pt"
-                        HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                <TextBlock
+                    Grid.Row="0"
+                    Text="{DynamicResource Text.Welcome.Repositories}"
+                    FontSize="13pt"
+                    HorizontalAlignment="Left" VerticalAlignment="Center"/>
+                
+                <!-- Repositories Tree DragDrop tip -->
+                <StackPanel Grid.Row="1" x:Name="dropTip" Margin="4,16,0,0" HorizontalAlignment="Left" Orientation="Vertical">
+                    <Path
+                        Data="{DynamicResource Icon.DragDrop}"
+                        Fill="{DynamicResource Brush.FG2}"
+                        Width="48" Height="48"
+                        VerticalAlignment="Top"/>
 
                     <TextBlock
                         Text="{DynamicResource Text.Welcome.DragDrop}"
                         FontSize="10pt"
-                        HorizontalAlignment="Right" VerticalAlignment="Top"
+                        Margin="0,8,0,0"
+                        HorizontalAlignment="Center" VerticalAlignment="Top"
                         Foreground="{DynamicResource Brush.FG2}"/>
-                </Grid>
+                </StackPanel>
 
                 <!-- Repositories Tree -->
                 <controls:Tree
@@ -245,6 +267,6 @@
         </Grid>
         
         <!-- Popup -->
-        <widgets:PopupPanel x:Name="popup" Grid.Row="0" Grid.RowSpan="3" Grid.Column="0" Grid.ColumnSpan="3"/>
+        <widgets:PopupPanel x:Name="popup" Grid.Row="0" Grid.RowSpan="4" Grid.Column="0" Grid.ColumnSpan="3"/>
     </Grid>
 </UserControl>
diff --git a/src/Views/Widgets/Welcome.xaml.cs b/src/Views/Widgets/Welcome.xaml.cs
index 0f5eab61..6c61ba31 100644
--- a/src/Views/Widgets/Welcome.xaml.cs
+++ b/src/Views/Widgets/Welcome.xaml.cs
@@ -360,6 +360,12 @@ namespace SourceGit.Views.Widgets {
 
             foreach (var path in dirty) Models.Preference.Instance.RemoveRecent(path);
             list.ItemsSource = repos;
+
+            if (repos.Count == 0) {
+                lblRecent.Visibility = Visibility.Hidden;
+            } else {
+                lblRecent.Visibility = Visibility.Visible;
+            }
         }
 
         private void UpdateTree(string editingNodeId = null) {
@@ -411,6 +417,12 @@ namespace SourceGit.Views.Widgets {
             }
 
             tree.ItemsSource = nodes;
+
+            if (nodes.Count > 0) {
+                dropTip.Visibility = Visibility.Collapsed;
+            } else {
+                dropTip.Visibility = Visibility.Visible;
+            }
         }
 
         private void DeleteNode(Node node) {