From df09ce01fadbee4e568174aa79aadb30d0c46fc5 Mon Sep 17 00:00:00 2001
From: leo <longshuang@msn.cn>
Date: Wed, 25 Feb 2026 10:32:47 +0800
Subject: [PATCH] revert: "refactor: commit message editor (#2096)"

This reverts commit ceea4a18fc6faa3c60baae6289afaed5c5dbcaba.
---
 src/Views/CommitMessageEditor.axaml    | 10 ++++++----
 src/Views/CommitMessageEditor.axaml.cs |  9 +++++----
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/src/Views/CommitMessageEditor.axaml b/src/Views/CommitMessageEditor.axaml
index 28a07636..c5345c3c 100644
--- a/src/Views/CommitMessageEditor.axaml
+++ b/src/Views/CommitMessageEditor.axaml
@@ -37,10 +37,12 @@
 
     <StackPanel Grid.Row="1" Orientation="Vertical" Margin="8">
       <v:CommitMessageToolBox x:Name="Editor" Height="400"/>
-      <Button Width="0" Height="0"
-              Margin="0" Padding="0"
-              Click="OnCloseByHotKey"
-              HotKey="Escape"/>
+      <Button Classes="flat primary"
+              Width="80"
+              Margin="0,8,0,4"
+              Content="{DynamicResource Text.Sure}"
+              Click="SaveAndClose"
+              HorizontalAlignment="Center"/>
     </StackPanel>
   </Grid>
 </v:ChromelessWindow>
diff --git a/src/Views/CommitMessageEditor.axaml.cs b/src/Views/CommitMessageEditor.axaml.cs
index 42fd6a12..73ebf6bf 100644
--- a/src/Views/CommitMessageEditor.axaml.cs
+++ b/src/Views/CommitMessageEditor.axaml.cs
@@ -60,18 +60,19 @@ namespace SourceGit.Views
         {
             base.OnClosed(e);
 
-            _onSave?.Invoke(Editor.CommitMessage);
-
             if (_shouldExitApp)
-                App.Quit(0);
+                App.Quit(_exitCode);
         }
 
-        private void OnCloseByHotKey(object sender, RoutedEventArgs e)
+        private void SaveAndClose(object _1, RoutedEventArgs _2)
         {
+            _onSave?.Invoke(Editor.CommitMessage);
+            _exitCode = 0;
             Close();
         }
 
         private Action<string> _onSave = null;
         private bool _shouldExitApp = true;
+        private int _exitCode = -1;
     }
 }