From c1368212dfe08f3c0586cbefcace26c329c31d90 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Sat, 30 Nov 2024 19:25:20 +0800
Subject: [PATCH] feature: change the `CONTINUE` button to `SplitButton` to
 support editing/splitting original commit (#767)

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/Resources/Styles.axaml        | 60 +++++++++++++++++++++++++++++++
 src/Views/WorkingCopy.axaml       | 25 +++++++------
 5 files changed, 78 insertions(+), 10 deletions(-)

diff --git a/src/Resources/Locales/en_US.axaml b/src/Resources/Locales/en_US.axaml
index fd42b0f5..d06635eb 100644
--- a/src/Resources/Locales/en_US.axaml
+++ b/src/Resources/Locales/en_US.axaml
@@ -680,6 +680,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">COMMIT &amp; PUSH</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">Template/Histories</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">Trigger click event</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">Commit (Edit)</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">Stage all changes and commit</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">Empty commit detected! Do you want to continue (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">CONFLICTS DETECTED</x:String>
diff --git a/src/Resources/Locales/zh_CN.axaml b/src/Resources/Locales/zh_CN.axaml
index a5af3400..9cf0eedf 100644
--- a/src/Resources/Locales/zh_CN.axaml
+++ b/src/Resources/Locales/zh_CN.axaml
@@ -684,6 +684,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交并推送</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">历史输入/模板</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">触发点击事件</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">提交（修改原始提交）</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自动暂存所有变更并提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">提交未包含变更文件！是否继续(--allow-empty)？</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">检测到冲突</x:String>
diff --git a/src/Resources/Locales/zh_TW.axaml b/src/Resources/Locales/zh_TW.axaml
index bf8b32e1..920d9114 100644
--- a/src/Resources/Locales/zh_TW.axaml
+++ b/src/Resources/Locales/zh_TW.axaml
@@ -683,6 +683,7 @@
   <x:String x:Key="Text.WorkingCopy.CommitAndPush" xml:space="preserve">提交並推送</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitMessageHelper" xml:space="preserve">歷史輸入/範本</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitTip" xml:space="preserve">觸發點擊事件</x:String>
+  <x:String x:Key="Text.WorkingCopy.CommitToEdit" xml:space="preserve">提交（修改現有提交）</x:String>
   <x:String x:Key="Text.WorkingCopy.CommitWithAutoStage" xml:space="preserve">自動暫存全部變更並提交</x:String>
   <x:String x:Key="Text.WorkingCopy.ConfirmCommitWithoutFiles" xml:space="preserve">未包含任何檔案變更! 您是否仍要提交 (--allow-empty)?</x:String>
   <x:String x:Key="Text.WorkingCopy.Conflicts" xml:space="preserve">檢測到衝突</x:String>
diff --git a/src/Resources/Styles.axaml b/src/Resources/Styles.axaml
index 6ea2af10..a42b2cb8 100644
--- a/src/Resources/Styles.axaml
+++ b/src/Resources/Styles.axaml
@@ -519,6 +519,66 @@
   <Style Selector="Button.flat:disabled">
     <Setter Property="Background" Value="{DynamicResource Brush.FlatButton.Background}"/>
   </Style>
+  
+  <Style Selector="SplitButton">
+    <Setter Property="MinHeight" Value="24"/>
+    <Setter Property="Template">
+      <ControlTemplate>
+        <Grid>
+          <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*" />
+            <ColumnDefinition Width="1" />
+            <ColumnDefinition Width="Auto" />
+          </Grid.ColumnDefinitions>
+
+          <Button x:Name="PART_PrimaryButton"
+                  Grid.Column="0"
+                  Classes="flat primary"
+                  MinWidth="32"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  Content="{TemplateBinding Content}"
+                  ContentTemplate="{TemplateBinding ContentTemplate}"
+                  Command="{TemplateBinding Command}"
+                  CommandParameter="{TemplateBinding CommandParameter}"
+                  CornerRadius="3,0,0,3"
+                  Padding="{TemplateBinding Padding}"
+                  Focusable="False"
+                  KeyboardNavigation.IsTabStop="False" />
+
+          <Button x:Name="PART_SecondaryButton"
+                  Grid.Column="2"
+                  Classes="flat primary"
+                  Width="32"
+                  CornerRadius="0,3,3,0"
+                  Padding="0"
+                  Focusable="False"
+                  HorizontalAlignment="Stretch"
+                  VerticalAlignment="Stretch"
+                  KeyboardNavigation.IsTabStop="False">
+            <Path Height="12" Width="12"
+                  Margin="0,4,0,0"
+                  Fill="{DynamicResource AccentButtonForeground}"
+                  Data="{DynamicResource Icons.Down}"/>
+          </Button>
+        </Grid>
+      </ControlTemplate>
+    </Setter>
+    
+    <Style Selector="^:disabled /template/ Button">
+      <Setter Property="BorderThickness" Value="1"/>
+      <Setter Property="BorderBrush" Value="{DynamicResource Brush.Border2}"/>
+      <Setter Property="Background" Value="Transparent"/>
+    </Style>
+    
+    <Style Selector="^:disabled TextBlock">
+      <Setter Property="Foreground" Value="{DynamicResource Brush.FG2}"/>
+    </Style>
+    
+    <Style Selector="^:disabled Path">
+      <Setter Property="Fill" Value="{DynamicResource Brush.FG2}"/>
+    </Style>
+  </Style>
 
   <Style Selector="aes|SearchPanel">
     <Setter Property="Template">
diff --git a/src/Views/WorkingCopy.axaml b/src/Views/WorkingCopy.axaml
index c830e5e8..e77547e7 100644
--- a/src/Views/WorkingCopy.axaml
+++ b/src/Views/WorkingCopy.axaml
@@ -243,16 +243,21 @@
                   Content="{DynamicResource Text.WorkingCopy.Amend}"/>
 
         <v:LoadingIcon Grid.Column="5" Width="18" Height="18" IsVisible="{Binding IsCommitting}"/>
-
-        <Button Grid.Column="6"
-                Classes="flat primary"
-                Content="{DynamicResource Text.Repository.Continue}"
-                Height="28"
-                Margin="8,0,0,0"
-                Padding="8,0"
-                Command="{Binding ContinueMerge}"
-                IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
-                IsEnabled="{Binding !HasUnsolvedConflicts}"/>
+        
+        <SplitButton Grid.Column="6"
+                     Content="{DynamicResource Text.Repository.Continue}"
+                     Height="28"
+                     Margin="8,0,0,0"
+                     Padding="8,0"
+                     Command="{Binding ContinueMerge}"
+                     IsVisible="{Binding InProgressContext, Converter={x:Static ObjectConverters.IsNotNull}}"
+                     IsEnabled="{Binding !HasUnsolvedConflicts}">
+          <SplitButton.Flyout>
+            <MenuFlyout>
+              <MenuItem Header="{DynamicResource Text.WorkingCopy.CommitToEdit}" Command="{Binding Commit}"/>
+            </MenuFlyout>
+          </SplitButton.Flyout>
+        </SplitButton>
 
         <Button Grid.Column="6"
                 Classes="flat primary"