code_review: PR #2194

Re-design the diff view toolbar

Signed-off-by: leo <longshuang@msn.cn>

Author: love-linger

src/ViewModels/TextDiffContext.cs

@@ -28,8 +28,6 @@ public class TextDiffContext : ObservableObject
     {
         public Models.DiffOption Option => _option;
         public Models.TextDiff Data => _data;
-        public int AddedLines => _data?.AddedLines ?? 0;
-        public int DeletedLines => _data?.DeletedLines ?? 0;
 
         public Vector ScrollOffset
         {

src/Views/DiffView.axaml

@@ -13,7 +13,7 @@
     <Grid RowDefinitions="26,*">
       <!-- Toolbar -->
       <Border Grid.Row="0" BorderThickness="0,0,0,1" BorderBrush="{DynamicResource Brush.Border2}">
-        <Grid ColumnDefinitions="Auto,Auto,*,Auto">
+        <Grid ColumnDefinitions="Auto,Auto,Auto,*,Auto">
           <!-- File Icon -->
           <Path Grid.Column="0" Width="12" Height="12" Data="{StaticResource Icons.File}" Margin="8,0,0,0"/>
 
@@ -28,12 +28,35 @@
                   ToolTip.Tip="{DynamicResource Text.Diff.FileModeChanged}">
             <TextBlock FontSize="10" HorizontalAlignment="Center" Margin="4,0" Text="{Binding FileModeChange}" Foreground="{DynamicResource Brush.BadgeFG}"/>
           </Border>
+          
+          <!-- Line Changes Summary -->
+          <ContentControl Grid.Column="2" Margin="4,0,0,0" Content="{Binding Content, Mode=OneWay}" IsVisible="{Binding IsTextDiff}">
+            <ContentControl.DataTemplates>
+              <DataTemplate DataType="vm:TextDiffContext">
+                <StackPanel Orientation="Horizontal" Spacing="4">
+                  <TextBlock FontSize="11"
+                             Foreground="Green"
+                             Text="{Binding Data.AddedLines, Mode=OneWay, StringFormat=+{0}}"
+                             IsVisible="{Binding Data.AddedLines, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
+                  <TextBlock FontSize="11"
+                             Foreground="Red"
+                             Text="{Binding Data.DeletedLines, Mode=OneWay, StringFormat=-{0}}"
+                             IsVisible="{Binding Data.DeletedLines, Converter={x:Static c:IntConverters.IsGreaterThanZero}}"/>
+                </StackPanel>
+              </DataTemplate>
+            </ContentControl.DataTemplates>
+          </ContentControl>
 
           <!-- Title -->
-          <TextBlock Grid.Column="2" Margin="4,0,0,0" Text="{Binding Title}" ToolTip.Tip="{Binding Title}" FontSize="11" TextTrimming="CharacterEllipsis"/>
+          <TextBlock Grid.Column="3"
+                     Margin="4,0,0,0"
+                     Text="{Binding Title}"
+                     ToolTip.Tip="{Binding Title}"
+                     FontSize="11"
+                     TextTrimming="CharacterEllipsis"/>
 
           <!-- Toolbar Buttons -->
-          <StackPanel Grid.Column="3" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
+          <StackPanel Grid.Column="4" Margin="8,0,0,0" Orientation="Horizontal" VerticalAlignment="Center">
             <Button Classes="icon_button"
                     Width="28"
                     Click="OnGotoFirstChange"
@@ -67,29 +90,7 @@
             <ContentControl Content="{Binding Content, Mode=OneWay}" IsVisible="{Binding IsTextDiff}">
               <ContentControl.DataTemplates>
                 <DataTemplate DataType="vm:TextDiffContext">
-                  <StackPanel Orientation="Horizontal" Spacing="6" VerticalAlignment="Center">
-                    <TextBlock Margin="0,0,0,0" FontSize="11" Text="{Binding BlockNavigation.Indicator}"/>
-                    <Border Height="16"
-                            Background="{DynamicResource Brush.Diff.AddedBG}"
-                            CornerRadius="8"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding AddedLines, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
-                      <TextBlock FontSize="10"
-                                 Margin="8,0"
-                                 Foreground="{DynamicResource Brush.FG1}"
-                                 Text="{Binding AddedLines, StringFormat=+{0}}"/>
-                    </Border>
-                    <Border Height="16"
-                            Background="{DynamicResource Brush.Diff.DeletedBG}"
-                            CornerRadius="8"
-                            VerticalAlignment="Center"
-                            IsVisible="{Binding DeletedLines, Converter={x:Static c:IntConverters.IsGreaterThanZero}}">
-                      <TextBlock FontSize="10"
-                                 Margin="8,0"
-                                 Foreground="{DynamicResource Brush.FG1}"
-                                 Text="{Binding DeletedLines, StringFormat=-{0}}"/>
-                    </Border>
-                  </StackPanel>
+                  <TextBlock Margin="0,0,0,0" FontSize="11" Text="{Binding BlockNavigation.Indicator}"/>
                 </DataTemplate>
               </ContentControl.DataTemplates>
             </ContentControl>