summaryrefslogtreecommitdiff
path: root/lib/console.tcl
diff options
context:
space:
mode:
authorShawn O. Pearce <spearce@spearce.org>2007-09-26 18:05:54 (GMT)
committerShawn O. Pearce <spearce@spearce.org>2007-09-26 18:06:08 (GMT)
commit6f2d73ec0cb6d5937bb4a62a222f942e4f886d6e (patch)
tree179c76a119cd1006665c3b47a6f5968904df33ff /lib/console.tcl
parentcd38c86fd8e8fbbc1d83b80f7d96cf19d8266196 (diff)
downloadgit-6f2d73ec0cb6d5937bb4a62a222f942e4f886d6e.zip
git-6f2d73ec0cb6d5937bb4a62a222f942e4f886d6e.tar.gz
git-6f2d73ec0cb6d5937bb4a62a222f942e4f886d6e.tar.bz2
git-gui: Don't delete console window namespaces too early
If the console finishes displaying its output and is "done" but needs to draw a scrollbar to show the final output messages it is possible for Tk to delete the window namespace before it does the text widget updates, which means we are unable to add the horizontal or vertical scrollbar to the window when the text widget decides it cannot draw all glyphs on screen. We need to delay deleting the window namespace until we know the window is not going to ever be used again. This occurs if we are done receiving output, the command is successful and the window is closed, or if the window is open and the user chooses to close the window after the command has completed. Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
Diffstat (limited to 'lib/console.tcl')
-rw-r--r--lib/console.tcl5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/console.tcl b/lib/console.tcl
index cde9a09..c0e6fb3 100644
--- a/lib/console.tcl
+++ b/lib/console.tcl
@@ -179,23 +179,26 @@ method insert {txt} {
method done {ok} {
if {$ok} {
if {[winfo exists $w.m.s]} {
+ bind $w.m.s <Destroy> [list delete_this $this]
$w.m.s conf -background green -text [mc "Success"]
if {$is_toplevel} {
$w.ok conf -state normal
focus $w.ok
}
+ } else {
+ delete_this
}
} else {
if {![winfo exists $w.m.s]} {
_init $this
}
+ bind $w.m.s <Destroy> [list delete_this $this]
$w.m.s conf -background red -text [mc "Error: Command Failed"]
if {$is_toplevel} {
$w.ok conf -state normal
focus $w.ok
}
}
- delete_this
}
method _sb_set {sb orient first last} {