From 1beafbc84cc3daa757bf0f113231979a80851a6f Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Fri, 14 Oct 2022 20:56:57 +0800
Subject: [PATCH] style<Welcome,PageTabBar>: re-design the style for Welcome
 page

---
 src/Views/Widgets/Welcome.xaml    | 84 ++++++++++++++-----------------
 src/Views/Widgets/Welcome.xaml.cs | 13 +++--
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/src/Views/Widgets/Welcome.xaml b/src/Views/Widgets/Welcome.xaml
index 3c0a8880..0c65b5a3 100644
--- a/src/Views/Widgets/Welcome.xaml
+++ b/src/Views/Widgets/Welcome.xaml
@@ -132,54 +132,48 @@
 
                     <ItemsControl.ItemTemplate>
                         <DataTemplate>
-                            <Control MouseDoubleClick="OnDoubleClickRepository">
-                                <Control.Template>
-                                    <ControlTemplate>
-                                        <Border
-                                            Height="36"
-                                            Margin="2"
-                                            BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" 
-                                            Background="{DynamicResource Brush.Contents}">
-                                            <Grid Margin="8,0">
-                                                <Grid.ColumnDefinitions>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="*"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                    <ColumnDefinition Width="Auto"/>
-                                                </Grid.ColumnDefinitions>
+                            <Border
+                                Height="36"
+                                Margin="2"
+                                BorderThickness="1" BorderBrush="{DynamicResource Brush.Border2}" 
+                                Background="{DynamicResource Brush.Contents}">
+                                <Grid Margin="8,0">
+                                    <Grid.ColumnDefinitions>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="*"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                        <ColumnDefinition Width="Auto"/>
+                                    </Grid.ColumnDefinitions>
 
-                                                <Button Grid.Column="0" Background="Transparent" Width="16" BorderThickness="0" ToolTip="{DynamicResource Text.RepoCM.Bookmark}" Click="OnChangeRepositoryBookmark">
-                                                    <Path Width="8" Fill="{Binding Bookmark, Converter={StaticResource IntToBookmarkBrush}}">
-                                                        <Path.Data>
-                                                            <EllipseGeometry Center="0,0" RadiusX="14" RadiusY="14"/>
-                                                        </Path.Data>
-                                                    </Path>
-                                                </Button>
+                                    <Button Grid.Column="0" Background="Transparent" Width="16" BorderThickness="0" ToolTip="{DynamicResource Text.RepoCM.Bookmark}" Click="OnChangeRepositoryBookmark">
+                                        <Path Width="8" Fill="{Binding Bookmark, Converter={StaticResource IntToBookmarkBrush}}">
+                                            <Path.Data>
+                                                <EllipseGeometry Center="0,0" RadiusX="14" RadiusY="14"/>
+                                            </Path.Data>
+                                        </Path>
+                                    </Button>
 
-                                                <TextBlock Grid.Column="1" Margin="8,0" Text="{Binding Name}" FontSize="12pt" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}"/>
-                                                <TextBlock Grid.Column="2" Text="{Binding Path}" FontSize="10pt" Foreground="{DynamicResource Brush.FG2}"/>
+                                    <TextBlock Grid.Column="1" Margin="8,0" Text="{Binding Name}" FontSize="12pt" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}"/>
+                                    <TextBlock Grid.Column="2" Text="{Binding Path}" FontSize="10pt" Foreground="{DynamicResource Brush.FG2}"/>
 
-                                                <Button Grid.Column="4" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.RepoCM.Open}" Click="OnOpenRepository">
-                                                    <Path Width="15" Data="{StaticResource Icon.Folder.Open}" Fill="{DynamicResource Brush.Accent1}"/>
-                                                </Button>
-                                                <Button Grid.Column="5" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.RepoCM.Explore}" Click="OnExploreRepository">
-                                                    <Path Width="15" Data="{StaticResource Icon.DiffWith}" Fill="{DynamicResource Brush.Accent1}"/>
-                                                </Button>
-                                                <Button Grid.Column="6" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.Welcome.OpenTerminal}" Click="OnOpenRepositoryTerminal">
-                                                    <Path Width="14" Data="{StaticResource Icon.Terminal}" Fill="{DynamicResource Brush.Accent1}"/>
-                                                </Button>
-                                                <Button Grid.Column="7" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.Welcome.Delete}" Click="OnRemoveRepository">
-                                                    <Path Width="10" Data="{StaticResource Icon.Close}" Fill="{DynamicResource Brush.Accent1}"/>
-                                                </Button>
-                                            </Grid>
-                                        </Border>
-                                    </ControlTemplate>
-                                </Control.Template>
-                            </Control>
+                                    <Button Grid.Column="4" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.RepoCM.Open}" Click="OnOpenRepository">
+                                        <Path Width="15" Data="{StaticResource Icon.Folder.Open}" Fill="{DynamicResource Brush.Accent1}"/>
+                                    </Button>
+                                    <Button Grid.Column="5" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.RepoCM.Explore}" Click="OnExploreRepository">
+                                        <Path Width="15" Data="{StaticResource Icon.DiffWith}" Fill="{DynamicResource Brush.Accent1}"/>
+                                    </Button>
+                                    <Button Grid.Column="6" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.Welcome.OpenTerminal}" Click="OnOpenRepositoryTerminal">
+                                        <Path Width="14" Data="{StaticResource Icon.Terminal}" Fill="{DynamicResource Brush.Accent1}"/>
+                                    </Button>
+                                    <Button Grid.Column="7" Margin="8,0,0,0" BorderThickness="0" Background="Transparent" ToolTip="{DynamicResource Text.Welcome.Delete}" Click="OnRemoveRepository">
+                                        <Path Width="10" Data="{StaticResource Icon.Close}" Fill="{DynamicResource Brush.Accent1}"/>
+                                    </Button>
+                                </Grid>
+                            </Border>
                         </DataTemplate>
                     </ItemsControl.ItemTemplate>
                 </ItemsControl>
diff --git a/src/Views/Widgets/Welcome.xaml.cs b/src/Views/Widgets/Welcome.xaml.cs
index 8ff4c429..33eea2be 100644
--- a/src/Views/Widgets/Welcome.xaml.cs
+++ b/src/Views/Widgets/Welcome.xaml.cs
@@ -69,23 +69,25 @@ namespace SourceGit.Views.Widgets {
 
         private void OnRemoveRepository(object sender, RoutedEventArgs e) {
             var repo = (sender as Button).DataContext as Models.Repository;
+            if (repo == null) return;
+
             Models.Preference.Instance.RemoveRepository(repo.Path);
             UpdateVisibles();
             e.Handled = true;
         }
 
-        private void OnDoubleClickRepository(object sender, MouseButtonEventArgs e) {
-            OnOpenRepository(sender, e);
-        }
-
         private void OnOpenRepository(object sender, RoutedEventArgs e) {
             var repo = (sender as Control).DataContext as Models.Repository;
+            if (repo == null) return;
+
             CheckAndOpen(repo.Path);
             e.Handled = true;
         }
 
         private void OnExploreRepository(object sender, RoutedEventArgs e) {
             var repo = (sender as Control).DataContext as Models.Repository;
+            if (repo == null) return;
+
             Process.Start("explorer", repo.Path);
             e.Handled = true;
         }
@@ -93,6 +95,7 @@ namespace SourceGit.Views.Widgets {
         private void OnChangeRepositoryBookmark(object sender, RoutedEventArgs e) {
             var btn = (sender as Button);
             var repo = btn.DataContext as Models.Repository;
+            if (repo == null) return;
 
             var menu = new ContextMenu();
             menu.Placement = PlacementMode.Bottom;
@@ -130,6 +133,8 @@ namespace SourceGit.Views.Widgets {
 
         private void OnOpenRepositoryTerminal(object sender, RoutedEventArgs e) {
             var repo = (sender as Button).DataContext as Models.Repository;
+            if (repo == null) return;
+
             var bash = Path.Combine(Models.Preference.Instance.Git.Path, "..", "bash.exe");
             if (!File.Exists(bash)) {
                 Models.Exception.Raise(App.Text("MissingBash"));