From 39fa2a983d55b37759b99e67f9f1892879efb775 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 11 Jun 2007 23:52:43 -0400 Subject: [PATCH] git-gui: Save geometry before the window layout is damaged Because Tk does not assure us the order that it will process children in before it destroys the main toplevel we cannot safely save our geometry data during a "bind . " event binding. The geometry may have already changed as a result of a one or more children being removed from the layout. This was pointed out in gitk by Mark Levedahl, and patched over there by commit b6047c5a8166a71e01c6b63ebbb67c6894d95114. So we now also use "wm protocol . WM_DELETE_WINDOW" to detect when the window is closed by the user, and forward that close event to our main do_quit routine. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 2 +- lib/blame.tcl | 1 - lib/browser.tcl | 1 - lib/class.tcl | 24 +++++++++++++++++++++--- lib/console.tcl | 2 +- lib/merge.tcl | 5 +++-- 6 files changed, 26 insertions(+), 9 deletions(-) diff --git a/git-gui.sh b/git-gui.sh index 0aecf41e6..97de595f2 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1622,7 +1622,7 @@ unset browser doc_path doc_url # -- Standard bindings # -bind . {if {{%W} eq {.}} do_quit} +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]} diff --git a/lib/blame.tcl b/lib/blame.tcl index 98687c77d..139171d39 100644 --- a/lib/blame.tcl +++ b/lib/blame.tcl @@ -289,7 +289,6 @@ constructor new {i_commit i_path} { bind $w_cviewer [list focus $w_cviewer] bind $top [list focus $top] - bind $w_file [list delete_this $this] grid configure $w.header -sticky ew grid configure $w.file_pane -sticky nsew diff --git a/lib/browser.tcl b/lib/browser.tcl index fd86b1121..3d6341bcc 100644 --- a/lib/browser.tcl +++ b/lib/browser.tcl @@ -70,7 +70,6 @@ constructor new {commit} { bind $w_list break bind $w_list [list focus $w_list] - bind $w_list [list delete_this $this] set w $w_list _ls $this $browser_commit return $this diff --git a/lib/class.tcl b/lib/class.tcl index 72494c1a1..9d298d0dc 100644 --- a/lib/class.tcl +++ b/lib/class.tcl @@ -120,10 +120,21 @@ proc delete_this {{t {}}} { if {[namespace exists $t]} {namespace delete $t} } -proc make_toplevel {t w} { - upvar $t top $w pfx +proc make_toplevel {t w args} { + upvar $t top $w pfx this this + + if {[llength $args] % 2} { + error "make_toplevel topvar winvar {options}" + } + set autodelete 1 + foreach {name value} $args { + switch -exact -- $name { + -autodelete {set autodelete $value} + default {error "unsupported option $name"} + } + } + if {[winfo ismapped .]} { - upvar this this regsub -all {::} $this {__} w set top .$w set pfx $top @@ -132,6 +143,13 @@ proc make_toplevel {t w} { set top . set pfx {} } + + if {$autodelete} { + wm protocol $top WM_DELETE_WINDOW " + [list delete_this $this] + [list destroy $top] + " + } } diff --git a/lib/console.tcl b/lib/console.tcl index 8c112f3a8..ce25d92ca 100644 --- a/lib/console.tcl +++ b/lib/console.tcl @@ -17,7 +17,7 @@ constructor new {short_title long_title} { method _init {} { global M1B - make_toplevel top w + make_toplevel top w -autodelete 0 wm title $top "[appname] ([reponame]): $t_short" set console_cr 1.0 diff --git a/lib/merge.tcl b/lib/merge.tcl index 24ed24b3d..ae0389df5 100644 --- a/lib/merge.tcl +++ b/lib/merge.tcl @@ -125,7 +125,8 @@ Please select fewer branches. To merge more than 15 branches, merge the branche set cons [console::new "Merge" $msg] console::exec $cons $cmd \ [namespace code [list _finish $revcnt $cons]] - bind $w {} + + wm protocol $w WM_DELETE_WINDOW {} destroy $w } @@ -250,7 +251,7 @@ proc dialog {} { bind $w <$M1B-Key-Return> $_start bind $w "grab $w; focus $w.source.l" bind $w "unlock_index;destroy $w" - bind $w unlock_index + wm protocol $w WM_DELETE_WINDOW "unlock_index;destroy $w" wm title $w "[appname] ([reponame]): Merge" tkwait window $w } -- 2.30.2