git@vger.kernel.org list mirror (unofficial, one of many)
 help / color / mirror / code / Atom feed
* [PATCH] git-gui: Call do_quit before destroying the main window
@ 2019-08-04 14:39 Pratyush Yadav
  2019-08-06 15:52 ` Pratyush Yadav
  0 siblings, 1 reply; 13+ messages in thread
From: Pratyush Yadav @ 2019-08-04 14:39 UTC (permalink / raw)
  To: git; +Cc: Junio C Hamano, Johannes Schindelin, Pratyush Yadav

If the toplevel window for the window being destroyed is the main window
(aka "."), then simply destroying it means the cleanup tasks are not
executed like saving the commit message buffer, saving window state,
etc. All this is handled by do_quit so, call it instead of directly
destroying the main window. For other toplevel windows, the old behavior
remains.

Signed-off-by: Pratyush Yadav <me@yadavpratyush.com>
---
 git-gui/git-gui.sh | 19 +++++++++++++++++--
 1 file changed, 17 insertions(+), 2 deletions(-)

diff --git a/git-gui/git-gui.sh b/git-gui/git-gui.sh
index 6de74ce639..6ec562d5da 100755
--- a/git-gui/git-gui.sh
+++ b/git-gui/git-gui.sh
@@ -3030,8 +3030,23 @@ unset doc_path doc_url
 wm protocol . WM_DELETE_WINDOW do_quit
 bind all <$M1B-Key-q> do_quit
 bind all <$M1B-Key-Q> do_quit
-bind all <$M1B-Key-w> {destroy [winfo toplevel %W]}
-bind all <$M1B-Key-W> {destroy [winfo toplevel %W]}
+
+set m1b_w_script {
+	set toplvl_win [winfo toplevel %W]
+
+	# If we are destroying the main window, we should call do_quit to take
+	# care of cleanup before exiting the program.
+	if {$toplvl_win eq "."} {
+		do_quit
+	} else {
+		destroy $toplvl_win
+	}
+}
+
+bind all <$M1B-Key-w> $m1b_w_script
+bind all <$M1B-Key-W> $m1b_w_script
+
+unset m1b_w_script
 
 set subcommand_args {}
 proc usage {} {
-- 
2.21.0


^ permalink raw reply	[flat|nested] 13+ messages in thread

end of thread, other threads:[~2019-08-13 17:30 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-08-04 14:39 [PATCH] git-gui: Call do_quit before destroying the main window Pratyush Yadav
2019-08-06 15:52 ` Pratyush Yadav
2019-08-06 18:22   ` Junio C Hamano
2019-08-06 19:04     ` Pratyush Yadav
2019-08-07  5:21       ` Junio C Hamano
2019-08-07 17:41         ` Junio C Hamano
2019-08-07 17:50       ` Junio C Hamano
2019-08-07 21:03         ` Pratyush Yadav
2019-08-07 21:53           ` Junio C Hamano
2019-08-09 14:42             ` Pratyush Yadav
2019-08-09 20:03               ` Junio C Hamano
2019-08-13 13:40                 ` Pratyush Yadav
2019-08-13 17:30                   ` Junio C Hamano

Code repositories for project(s) associated with this inbox:

	https://80x24.org/mirrors/git.git

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).