From c6951ddb522a7d8ee0fc371cf9c37e727e676989 Mon Sep 17 00:00:00 2001 From: "Shawn O. Pearce" Date: Mon, 20 Aug 2007 00:53:04 -0400 Subject: [PATCH] git-gui: Fix window manager problems on ion3 cehteh on #git noticed that secondary windows such as console windows from push/fetch/merge or the blame browser failed on ion when we tried to open them a second time. The issue turned out to be the fact that on ion [winfo ismapped .] returns false if . is not visible right now because it has been obscured by another window in the same panel. So we need to keep track of whether or not the root window has been displayed for this application, and once it has been we cannot ever assume that ismapped is going to return true. Signed-off-by: Shawn O. Pearce --- git-gui.sh | 6 ++++++ lib/class.tcl | 3 ++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/git-gui.sh b/git-gui.sh index 29a790e48..2686c1b8f 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -1936,6 +1936,12 @@ if {$browser ne {}} { } unset browser doc_path doc_url +set root_exists 0 +bind . { + bind . {} + set root_exists 1 +} + # -- Standard bindings # wm protocol . WM_DELETE_WINDOW do_quit diff --git a/lib/class.tcl b/lib/class.tcl index 24e8cecea..dc2141192 100644 --- a/lib/class.tcl +++ b/lib/class.tcl @@ -148,11 +148,12 @@ proc make_toplevel {t w args} { } } - if {[winfo ismapped .]} { + if {$::root_exists || [winfo ismapped .]} { regsub -all {::} $this {__} w set top .$w set pfx $top toplevel $top + set ::root_exists 1 } else { set top . set pfx {} -- 2.26.2