enhance: restore original commit message if target commit changed from pending target to normal reword/edit

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

Author: love-linger

src/ViewModels/InteractiveRebase.cs

@@ -386,6 +386,7 @@ private void UpdateItems()
                 if (item.Action == Models.InteractiveRebaseAction.Reword ||
                     item.Action == Models.InteractiveRebaseAction.Edit)
                 {
+                    var oldPendingType = item.PendingType;
                     item.IsFullMessageUsed = true;
                     item.ShowEditMessageButton = true;
                     item.PendingType = hasPending ? Models.InteractiveRebasePendingType.Target : Models.InteractiveRebasePendingType.None;
@@ -405,6 +406,11 @@ private void UpdateItems()
                         hasPending = false;
                         pendingMessages.Clear();
                     }
+                    else if (oldPendingType == Models.InteractiveRebasePendingType.Target)
+                    {
+                        if (!item.IsMessageUserEdited)
+                            item.FullMessage = item.OriginalFullMessage;
+                    }
 
                     continue;
                 }

src/Views/InteractiveRebase.axaml.cs

@@ -113,7 +113,7 @@ public override void Render(DrawingContext context)
                 return;
 
             var startW = 4;
-            var endW = Bounds.Width - 4;
+            var endW = Bounds.Width - 6;
             var height = Bounds.Height;
             var halfH = height * 0.5;
             var fill = Fill;