ux: new layout for Blame window

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

Author: love-linger

src/Views/Blame.axaml

@@ -12,7 +12,7 @@
                     Icon="/App.ico"
                     Title="{DynamicResource Text.Blame}"
                     MinWidth="1280" MinHeight="720">
-  <Grid RowDefinitions="Auto,28,*,36">
+  <Grid RowDefinitions="Auto,32,*,36">
     <!-- TitleBar -->
     <Grid Grid.Row="0" Height="28" IsVisible="{Binding !#ThisControl.UseSystemWindowFrame}">
       <!-- Bottom border -->
@@ -37,8 +37,8 @@
     </Grid>
 
     <!-- File -->
-    <Border Grid.Row="1" Padding="8,0" >
-      <Grid ColumnDefinitions="Auto,*,Auto,Auto,400,Auto">
+    <Border Grid.Row="1" Height="32" VerticalAlignment="Center">
+      <Grid Margin="8,0,0,0" ColumnDefinitions="Auto,*">
         <Path Grid.Column="0"
               Width="14" Height="14"
               Data="{StaticResource Icons.File}"/>
@@ -47,44 +47,6 @@
                    Margin="4,0,0,0"
                    VerticalAlignment="Center"
                    Text="{Binding File, Mode=OneWay}"/>
-
-        <Button Grid.Column="2"
-                Classes="icon_button"
-                IsEnabled="{Binding CanBack}"
-                Width="28"
-                Command="{Binding Back}">
-          <Path Width="12" Height="12" Data="{StaticResource Icons.TriangleLeft}"/>
-        </Button>
-
-        <Button Grid.Column="3"
-                Classes="icon_button"
-                IsEnabled="{Binding CanForward}"
-                Width="28"
-                Command="{Binding Forward}">
-          <Path Width="12" Height="12" Data="{StaticResource Icons.TriangleRight}"/>
-        </Button>
-
-        <Border Grid.Column="4" Background="#40000000" CornerRadius="3" Padding="4,0" Margin="0,2">
-          <Grid ColumnDefinitions="Auto,*">
-            <TextBlock Grid.Column="0"
-                       FontWeight="Bold"
-                       Margin="0,0,6,0"
-                       Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
-
-            <TextBlock Grid.Column="1"
-                       Text="{Binding Revision.Subject}"
-                       TextTrimming="CharacterEllipsis"/>
-          </Grid>
-        </Border>
-
-        <Button Grid.Column="5"
-                Classes="icon_button"
-                IsEnabled="{Binding PrevRevision, Converter={x:Static ObjectConverters.IsNotNull}}"
-                Width="28" Margin="4,0,0,0"
-                Command="{Binding GotoPrevRevision}"
-                ToolTip.Tip="{DynamicResource Text.Blame.BlameOnPreviousRevision}">
-          <Path Width="14" Height="14" Data="{StaticResource Icons.GotoParent}"/>
-        </Button>
       </Grid>
     </Border>
 
@@ -125,10 +87,50 @@
     </Grid>
 
     <!-- Option -->
-    <Grid Grid.Row="3" Margin="8,0" Height="32" VerticalAlignment="Top">
-      <CheckBox Content="{DynamicResource Text.Blame.IgnoreWhitespace}"
+    <Grid Grid.Row="3" Height="32" ColumnDefinitions="*,Auto,Auto,520,Auto" VerticalAlignment="Top">
+      <CheckBox Grid.Column="0"
+                Margin="8,0,0,0"
+                Content="{DynamicResource Text.Blame.IgnoreWhitespace}"
                 IsChecked="{Binding IgnoreWhitespace, Mode=TwoWay}"
                 ToolTip.Tip="-w"/>
+
+      <Button Grid.Column="1"
+                Classes="icon_button"
+                IsEnabled="{Binding CanBack}"
+                Width="28"
+                Command="{Binding Back}">
+        <Path Width="12" Height="12" Data="{StaticResource Icons.TriangleLeft}"/>
+      </Button>
+
+      <Button Grid.Column="2"
+              Classes="icon_button"
+              IsEnabled="{Binding CanForward}"
+              Width="28"
+              Command="{Binding Forward}">
+        <Path Width="12" Height="12" Data="{StaticResource Icons.TriangleRight}"/>
+      </Button>
+
+      <Border Grid.Column="3" Padding="6,0" Margin="0,2" CornerRadius="4" Background="#20000000" BoxShadow="inset 0 0 3 3 #20000000">
+        <Grid ColumnDefinitions="Auto,*">
+          <TextBlock Grid.Column="0"
+                     FontWeight="Bold"
+                     Margin="0,0,6,0"
+                     Text="{Binding Revision.SHA, Converter={x:Static c:StringConverters.ToShortSHA}, Mode=OneWay}"/>
+
+          <TextBlock Grid.Column="1"
+                     Text="{Binding Revision.Subject}"
+                     TextTrimming="CharacterEllipsis"/>
+        </Grid>
+      </Border>
+
+      <Button Grid.Column="4"
+              Classes="icon_button"
+              IsEnabled="{Binding PrevRevision, Converter={x:Static ObjectConverters.IsNotNull}}"
+              Width="28" Margin="4,0"
+              Command="{Binding GotoPrevRevision}"
+              ToolTip.Tip="{DynamicResource Text.Blame.BlameOnPreviousRevision}">
+        <Path Width="14" Height="14" Data="{StaticResource Icons.GotoParent}"/>
+      </Button>
     </Grid>
   </Grid>
 </v:ChromelessWindow>