From 719bdaae3c152f0fea8472afd27f1613a4d2a157 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Tue, 8 Jul 2025 11:49:37 +0800
Subject: [PATCH] code_review: PR #1544

Add tooltip for reordering commits

Signed-off-by: leo <longshuang@msn.cn>
---
 src/Resources/Locales/en_US.axaml    |  1 +
 src/Resources/Locales/zh_CN.axaml    |  1 +
 src/Resources/Locales/zh_TW.axaml    |  1 +
 src/Views/InteractiveRebase.axaml    |  7 +++++++
 src/Views/InteractiveRebase.axaml.cs | 26 ++++++++++++--------------
 5 files changed, 22 insertions(+), 14 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index 038d3eb1..f1fc4772 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -453,6 +453,7 @@
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">Reverting commit</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">Interactive Rebase</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">On:</x:String>
+  <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">Drag-drop to reorder commits</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">Target Branch:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">Copy Link</x:String>
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">Open in Browser</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index 3375c564..75c26b45 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -457,6 +457,7 @@
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">正在回滚提交</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">交互式变基</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交 ：</x:String>
+  <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">拖拽以便对提交重新排序</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">目标分支 ：</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">复制链接地址</x:String>
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在浏览器中访问</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index 0f9e900e..47026ab1 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -457,6 +457,7 @@
   <x:String x:Key="Text.InProgress.Revert.Head" xml:space="preserve">正在復原提交</x:String>
   <x:String x:Key="Text.InteractiveRebase" xml:space="preserve">互動式重定基底</x:String>
   <x:String x:Key="Text.InteractiveRebase.On" xml:space="preserve">起始提交:</x:String>
+  <x:String x:Key="Text.InteractiveRebase.ReorderTip" xml:space="preserve">拖曳以重新排序提交</x:String>
   <x:String x:Key="Text.InteractiveRebase.Target" xml:space="preserve">目標分支:</x:String>
   <x:String x:Key="Text.IssueLinkCM.CopyLink" xml:space="preserve">複製連結</x:String>
   <x:String x:Key="Text.IssueLinkCM.OpenInBrowser" xml:space="preserve">在瀏覽器中開啟連結</x:String>
diff --git a/src/Views/InteractiveRebase.axaml b/src/Views/InteractiveRebase.axaml
index 8ab78b92..b6b87b46 100644
--- a/src/Views/InteractiveRebase.axaml
+++ b/src/Views/InteractiveRebase.axaml
@@ -94,6 +94,13 @@
                 <Border Grid.Column="0" Background="Transparent"
                         Loaded="OnSetupRowHeaderDragDrop"
                         PointerPressed="OnRowHeaderPointerPressed">
+                  <ToolTip.Tip>
+                    <TextBlock>
+                      <Run Text="{DynamicResource Text.InteractiveRebase.ReorderTip}"/>
+                      <Run Text=" "/>
+                      <Run Text="{OnPlatform 'Ctrl+Up/Ctrl+Down', macOS='⌘+Up/⌘+Down'}" Foreground="{DynamicResource Brush.FG2}"/>
+                    </TextBlock>
+                  </ToolTip.Tip>
                   <Path Width="14" Height="14"
                         Data="{StaticResource Icons.Move}"
                         Fill="{DynamicResource Brush.FG2}"
diff --git a/src/Views/InteractiveRebase.axaml.cs b/src/Views/InteractiveRebase.axaml.cs
index f1cfbbaa..c49fab26 100644
--- a/src/Views/InteractiveRebase.axaml.cs
+++ b/src/Views/InteractiveRebase.axaml.cs
@@ -59,24 +59,22 @@ namespace SourceGit.Views
                 vm.ChangeAction(item, Models.InteractiveRebaseAction.Drop);
                 e.Handled = true;
             }
-            else
+            else if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
             {
-                if (e.KeyModifiers.HasFlag(OperatingSystem.IsMacOS() ? KeyModifiers.Meta : KeyModifiers.Control))
+                if (e.Key == Key.Up)
                 {
-                    if (e.Key == Key.Up)
-                    {
-                        vm.MoveItemUp(item);
-                        e.Handled = true;
-                    }
-                    else if (e.Key == Key.Down)
-                    {
-                        vm.MoveItemDown(item);
-                        e.Handled = true;
-                    }
+                    vm.MoveItemUp(item);
+                    e.Handled = true;
+                }
+                else if (e.Key == Key.Down)
+                {
+                    vm.MoveItemDown(item);
+                    e.Handled = true;
                 }
-
-                base.OnKeyDown(e);
             }
+
+            if (!e.Handled)
+                base.OnKeyDown(e);
         }
     }