From 807cec8a303a9f5b4e1efe77435d4327b10ad731 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Thu, 28 Nov 2024 21:40:51 +0800
Subject: [PATCH] fix: wrong column indentation on right side of Interactive
 Rebase window, for wide commit messages (#764)

---
 src/Views/InteractiveRebase.axaml | 48 +++++++++++++++++--------------
 1 file changed, 26 insertions(+), 22 deletions(-)

diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index c008193b..63fcc2ec 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -76,7 +76,7 @@
 
           <ListBox.ItemTemplate>
             <DataTemplate DataType="vm:InteractiveRebaseItem">
-              <Grid ColumnDefinitions="16,110,*,40,100,96,156,32,32">
+              <Grid ColumnDefinitions="16,110,*,140,96,156,32,32">
                 <!-- Drag & Drop Anchor -->
                 <Border Grid.Column="0" Background="Transparent"
                         Margin="4,0,0,0"
@@ -170,8 +170,8 @@
                 </Button>
 
                 <!-- Subject -->
-                <StackPanel Grid.Column="2" Orientation="Horizontal" ClipToBounds="True">
-                  <Button Classes="icon_button" IsVisible="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.CanEditMessage}}">
+                <Grid Grid.Column="2" ColumnDefinitions="Auto,*" ClipToBounds="True">
+                  <Button Grid.Column="0" Classes="icon_button" IsVisible="{Binding Action, Converter={x:Static c:InteractiveRebaseActionConverters.CanEditMessage}}">
                     <Button.Flyout>
                       <Flyout Placement="BottomEdgeAlignedLeft">
                         <Panel Width="600" Height="120">
@@ -181,37 +181,41 @@
                     </Button.Flyout>
                     <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Edit}"/>
                   </Button>
-                  <TextBlock Classes="primary" Text="{Binding Subject}" Margin="8,0,0,0"/>
-                </StackPanel>
-
-                <!-- Avatar -->
-                <v:Avatar Grid.Column="3"
-                          Width="16" Height="16"
-                          Margin="16,0,8,0"
-                          VerticalAlignment="Center"
-                          IsHitTestVisible="False"
-                          User="{Binding Commit.Author}"/>
+                  <TextBlock Grid.Column="1" Classes="primary" Text="{Binding Subject}" Margin="8,0,0,0"/>
+                </Grid>
 
                 <!-- Author -->
-                <Border Grid.Column="4" ClipToBounds="True">
-                  <TextBlock Classes="primary" Text="{Binding Commit.Author.Name}" HorizontalAlignment="Left"/>
-                </Border>
+                <Grid Grid.Column="3" ColumnDefinitions="Auto,*" Width="140" ClipToBounds="True">
+                  <v:Avatar Grid.Column="0"
+                            Width="16" Height="16"
+                            Margin="8,0,0,0"
+                            VerticalAlignment="Center"
+                            IsHitTestVisible="False"
+                            User="{Binding Commit.Author}"/>
+                  <TextBlock Grid.Column="1"
+                             Classes="primary"
+                             Margin="6,0,12,0"
+                             Text="{Binding Commit.Author.Name}"
+                             HorizontalAlignment="Left"/>
+                </Grid>
                 
                 <!-- Commit SHA -->
-                <TextBlock Grid.Column="5" Classes="primary"
-                           Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
-                           Margin="12,0"/>
+                <Border Grid.Column="4" IsHitTestVisible="False" ClipToBounds="True">
+                  <TextBlock Classes="primary"
+                             Text="{Binding Commit.SHA, Converter={x:Static c:StringConverters.ToShortSHA}}"
+                             HorizontalAlignment="Center"/>
+                </Border>
 
                 <!-- Commit Time -->
-                <TextBlock Grid.Column="6" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
+                <TextBlock Grid.Column="5" Classes="primary" Text="{Binding Commit.CommitterTimeStr}" Margin="8,0"/>
 
                 <!-- MoveUp Button -->
-                <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
+                <Button Grid.Column="6" Classes="icon_button" Click="OnMoveItemUp" ToolTip.Tip="Alt+Up">
                   <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Up}"/>
                 </Button>
                 
                 <!-- MoveDown Button -->
-                <Button Grid.Column="8" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
+                <Button Grid.Column="7" Classes="icon_button" Click="OnMoveItemDown" ToolTip.Tip="Alt+Down">
                   <Path Width="14" Height="14" Margin="0,4,0,0" Data="{StaticResource Icons.Down}"/>
                 </Button>
               </Grid>