From 2516f11231c7794781d3f509f9bb0c617e17a4eb Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 11 Oct 2023 15:37:23 +0800
Subject: [PATCH] refactor<RevisionCompare, Histories>: show author rather than
 committer in RevisionCompare/Histories

---
 src/Views/Widgets/Histories.xaml          |  6 +-
 src/Views/Widgets/RevisionCompare.xaml    | 92 +++++++++++------------
 src/Views/Widgets/RevisionCompare.xaml.cs | 10 ++-
 3 files changed, 52 insertions(+), 56 deletions(-)

diff --git a/src/Views/Widgets/Histories.xaml b/src/Views/Widgets/Histories.xaml
index eb1190be..002c0b93 100644
--- a/src/Views/Widgets/Histories.xaml
+++ b/src/Views/Widgets/Histories.xaml
@@ -122,8 +122,8 @@
                                     <controls:Avatar 
                                         Width="16" Height="16" 
                                         HorizontalAlignment="Center" VerticalAlignment="Center" 
-                                        Email="{Binding Committer.Email}" 
-                                        FallbackLabel="{Binding Committer.Name}"/>
+                                        Email="{Binding Author.Email}" 
+                                        FallbackLabel="{Binding Author.Name}"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
@@ -131,7 +131,7 @@
                         <DataGridTemplateColumn Width="80" IsReadOnly="True">
                             <DataGridTemplateColumn.CellTemplate>
                                 <DataTemplate>
-                                    <TextBlock Text="{Binding Committer.Name}" Margin="0,0,8,0"/>
+                                    <TextBlock Text="{Binding Author.Name}" Margin="0,0,8,0"/>
                                 </DataTemplate>
                             </DataGridTemplateColumn.CellTemplate>
                         </DataGridTemplateColumn>
diff --git a/src/Views/Widgets/RevisionCompare.xaml b/src/Views/Widgets/RevisionCompare.xaml
index 4e66a372..d44fc37b 100644
--- a/src/Views/Widgets/RevisionCompare.xaml
+++ b/src/Views/Widgets/RevisionCompare.xaml
@@ -10,7 +10,7 @@
              d:DesignHeight="450" d:DesignWidth="800">
     <Grid Margin="4,8,4,4">
         <Grid.RowDefinitions>
-            <RowDefinition Height="44"/>
+            <RowDefinition Height="48"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
 
@@ -28,33 +28,30 @@
                 BorderBrush="{DynamicResource Brush.Border2}"
                 BorderThickness="1"
                 Background="{DynamicResource Brush.Contents}"
-                CornerRadius="4">
-                <Grid Margin="4">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
+                CornerRadius="4"
+                Padding="4"
+                TextElement.FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
 
-                    <controls:Avatar Grid.Column="0" Width="32" Height="32" x:Name="avatarStart"/>
+                    <Grid Grid.Row="0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-                    <Grid Grid.Column="1" Margin="8,0,0,0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-
-                        <Grid Grid.Row="0">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock Grid.Column="0" x:Name="txtStartSHA" Foreground="DarkOrange" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}"/>
-                            <TextBlock Grid.Column="1" x:Name="txtStartTime" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}"/>
-                        </Grid>
-
-                        <TextBlock Grid.Row="1" x:Name="txtStartSubject" VerticalAlignment="Bottom" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}" FontSize="10pt"/>
+                        <controls:Avatar Grid.Column="0" Width="14" Height="14" x:Name="avatarStart"/>
+                        <TextBlock Grid.Column="1" x:Name="txtStartAuthor" Foreground="{DynamicResource Brush.FG1}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="2" x:Name="txtStartSHA" Foreground="DarkOrange" Margin="8,0,0,0" />
+                        <TextBlock Grid.Column="3" x:Name="txtStartTime" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                     </Grid>
+
+                    <TextBlock Grid.Row="1" Margin="4,0" x:Name="txtStartSubject" VerticalAlignment="Bottom" FontSize="10pt"/>
                 </Grid>
             </Border>
 
@@ -74,33 +71,30 @@
                 BorderBrush="{DynamicResource Brush.Border2}"
                 BorderThickness="1"
                 Background="{DynamicResource Brush.Contents}"
-                CornerRadius="4">
-                <Grid Margin="4">
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="Auto"/>
-                        <ColumnDefinition Width="*"/>
-                    </Grid.ColumnDefinitions>
+                Padding="4"
+                CornerRadius="4"
+                TextElement.FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}">
+                <Grid>
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="Auto"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
 
-                    <controls:Avatar Grid.Column="0" Width="32" Height="32" x:Name="avatarEnd"/>
+                    <Grid Grid.Row="0">
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-                    <Grid Grid.Column="1" Margin="8,0,0,0">
-                        <Grid.RowDefinitions>
-                            <RowDefinition Height="Auto"/>
-                            <RowDefinition Height="*"/>
-                        </Grid.RowDefinitions>
-
-                        <Grid Grid.Row="0">
-                            <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto"/>
-                                <ColumnDefinition Width="*"/>
-                            </Grid.ColumnDefinitions>
-
-                            <TextBlock Grid.Column="0" x:Name="txtEndSHA" Foreground="DarkOrange" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}" />
-                            <TextBlock Grid.Column="1" x:Name="txtEndTime" Foreground="{DynamicResource Brush.FG2}" HorizontalAlignment="Right" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}" />
-                        </Grid>
-
-                        <TextBlock Grid.Row="1" x:Name="txtEndSubject" VerticalAlignment="Bottom" FontFamily="{Binding Source={x:Static models:Preference.Instance}, Path=General.FontFamilyContent, Mode=OneWay}" FontSize="10pt"/>
+                        <controls:Avatar Grid.Column="0" Width="14" Height="14" x:Name="avatarEnd"/>
+                        <TextBlock Grid.Column="1" x:Name="txtEndAuthor" Foreground="{DynamicResource Brush.FG1}" Margin="8,0,0,0"/>
+                        <TextBlock Grid.Column="2" x:Name="txtEndSHA" Foreground="DarkOrange" Margin="8,0,0,0" />
+                        <TextBlock Grid.Column="3" x:Name="txtEndTime" Foreground="{DynamicResource Brush.FG2}" Margin="8,0,0,0"/>
                     </Grid>
+
+                    <TextBlock Grid.Row="1" Margin="4,0" x:Name="txtEndSubject" VerticalAlignment="Bottom" FontSize="10pt"/>
                 </Grid>
             </Border>
         </Grid>
diff --git a/src/Views/Widgets/RevisionCompare.xaml.cs b/src/Views/Widgets/RevisionCompare.xaml.cs
index 75ce957b..5336d01a 100644
--- a/src/Views/Widgets/RevisionCompare.xaml.cs
+++ b/src/Views/Widgets/RevisionCompare.xaml.cs
@@ -13,16 +13,18 @@ namespace SourceGit.Views.Widgets {
         }
 
         public void SetData(string repo, Models.Commit start, Models.Commit end) {
-            avatarStart.Email = start.Committer.Email;
-            avatarStart.FallbackLabel = start.Committer.Name;
+            avatarStart.Email = start.Author.Email;
+            avatarStart.FallbackLabel = start.Author.Name;
             avatarStart.ToolTip = start.Committer.Name;
+            txtStartAuthor.Text = start.Author.Name;
             txtStartSHA.Text = start.ShortSHA;
             txtStartTime.Text = start.CommitterTimeStr;
             txtStartSubject.Text = start.Subject;
 
-            avatarEnd.Email = end.Committer.Email;
-            avatarEnd.FallbackLabel = end.Committer.Name;
+            avatarEnd.Email = end.Author.Email;
+            avatarEnd.FallbackLabel = end.Author.Name;
             avatarEnd.ToolTip = end.Committer.Name;
+            txtEndAuthor.Text = end.Author.Name;
             txtEndSHA.Text = end.ShortSHA;
             txtEndTime.Text = end.CommitterTimeStr;
             txtEndSubject.Text = end.Subject;