undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-gui: Ensure error dialogs always appear over all other windows

Browse Source 
If we are opening an error dialog we want it to appear above all of
the other windows, even those that we may have opened with a grab
to make the window modal.  Failure to do so may allow an error
dialog to open up (and grab focus!) under an existing toplevel,
making the user think git-gui has frozen up and is unresponsive,
as they cannot get to the dialog.

Signed-off-by: Shawn O. Pearce <spearce@spearce.org>
This commit is contained in:
Shawn O. Pearce 2008-02-20 23:37:07 -05:00
parent 2c2a3782c5
commit aba15f7f59
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
lib/error.tcl
View File

@ -1,6 +1,10 @@
# git-gui branch (create/delete) support # git-gui branch (create/delete) support
# Copyright (C) 2006, 2007 Shawn Pearce # Copyright (C) 2006, 2007 Shawn Pearce
proc _error_parent {} {
return [grab current .]
}
proc error_popup {msg} { proc error_popup {msg} {
set title [appname] set title [appname]
if {[reponame] ne {}} { if {[reponame] ne {}} {
@ -11,8 +15,8 @@ proc error_popup {msg} {
-type ok \ -type ok \
-title [append "$title: " [mc "error"]] \ -title [append "$title: " [mc "error"]] \
-message $msg] -message $msg]
if {[winfo ismapped .]} { if {[winfo ismapped [_error_parent]]} {
lappend cmd -parent . lappend cmd -parent [_error_parent]
} }
eval $cmd eval $cmd
} }
@ -27,13 +31,13 @@ proc warn_popup {msg} {
-type ok \ -type ok \
-title [append "$title: " [mc "warning"]] \ -title [append "$title: " [mc "warning"]] \
-message $msg] -message $msg]
if {[winfo ismapped .]} { if {[winfo ismapped [_error_parent]]} {
lappend cmd -parent . lappend cmd -parent [_error_parent]
} }
eval $cmd eval $cmd
} }
proc info_popup {msg {parent .}} { proc info_popup {msg} {
set title [appname] set title [appname]
if {[reponame] ne {}} { if {[reponame] ne {}} {
append title " ([reponame])" append title " ([reponame])"
@ -56,8 +60,8 @@ proc ask_popup {msg} {
-type yesno \ -type yesno \
-title $title \ -title $title \
-message $msg] -message $msg]
if {[winfo ismapped .]} { if {[winfo ismapped [_error_parent]]} {
lappend cmd -parent . lappend cmd -parent [_error_parent]
} }
eval $cmd eval $cmd
} }