revert: "refactor: commit message editor (#2096)"

love-linger · love-linger · commit df09ce01fadb · 2026-02-25T10:32:47.000+08:00
This reverts commit ceea4a1.
diff --git 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
@@ -60,18 +60,19 @@ protected override void OnClosed(EventArgs e)
         {
             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;
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -60,18 +60,19 @@ protected override void OnClosed(EventArgs e)`
`60`	`60`	`{`
`61`	`61`	`base.OnClosed(e);`
`62`	`62`
`63`		`- _onSave?.Invoke(Editor.CommitMessage);`
`64`		`-`
`65`	`63`	`if (_shouldExitApp)`
`66`		`- App.Quit(0);`
	`64`	`+ App.Quit(_exitCode);`
`67`	`65`	`}`
`68`	`66`
`69`		`- private void OnCloseByHotKey(object sender, RoutedEventArgs e)`
	`67`	`+ private void SaveAndClose(object _1, RoutedEventArgs _2)`
`70`	`68`	`{`
	`69`	`+ _onSave?.Invoke(Editor.CommitMessage);`
	`70`	`+ _exitCode = 0;`
`71`	`71`	`Close();`
`72`	`72`	`}`
`73`	`73`
`74`	`74`	`private Action<string> _onSave = null;`
`75`	`75`	`private bool _shouldExitApp = true;`
	`76`	`+ private int _exitCode = -1;`
`76`	`77`	`}`
`77`	`78`	`}`