mirror of
https://github.com/git/git
synced 2024-08-25 10:45:59 +00:00
Make gitk save and restore the user set window position.
gitk was saving widget sizes and positions when the main window was destroyed, which is after all child widgets are destroyed. The cure is to trap the WM_DELETE_WINDOW event before the gui is torn down. Also, the saved geometry was captured using "winfo geometry .", rather than "wm geometry ." Under Linux, these two return different answers and the latter one is correct. [jc: credit goes to Brett Schwarz for suggesting the use of "wm protocol"; I also squashed the follow-up patch to remove extraneous -0 from expressions.] Signed-off-by: Mark Levedahl <mdl123@verizon.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
This commit is contained in:
parent
788743240e
commit
602598fd5d
11
gitk
11
gitk
|
@ -725,7 +725,7 @@ proc makewindow {} {
|
|||
bind . <Control-KP_Add> {incrfont 1}
|
||||
bind . <Control-minus> {incrfont -1}
|
||||
bind . <Control-KP_Subtract> {incrfont -1}
|
||||
bind . <Destroy> {savestuff %W}
|
||||
wm protocol . WM_DELETE_WINDOW doquit
|
||||
bind . <Button-1> "click %W"
|
||||
bind $fstring <Key-Return> dofind
|
||||
bind $sha1entry <Key-Return> gotocommit
|
||||
|
@ -829,12 +829,12 @@ proc savestuff {w} {
|
|||
puts $f [list set colors $colors]
|
||||
puts $f [list set diffcolors $diffcolors]
|
||||
|
||||
puts $f "set geometry(main) [winfo geometry .]"
|
||||
puts $f "set geometry(main) [wm geometry .]"
|
||||
puts $f "set geometry(topwidth) [winfo width .tf]"
|
||||
puts $f "set geometry(topheight) [winfo height .tf]"
|
||||
puts $f "set geometry(canv) [expr {[winfo width $canv]-0}]"
|
||||
puts $f "set geometry(canv2) [expr {[winfo width $canv2]-0}]"
|
||||
puts $f "set geometry(canv3) [expr {[winfo width $canv3]-0}]"
|
||||
puts $f "set geometry(canv) [winfo width $canv]"
|
||||
puts $f "set geometry(canv2) [winfo width $canv2]"
|
||||
puts $f "set geometry(canv3) [winfo width $canv3]"
|
||||
puts $f "set geometry(botwidth) [winfo width .bleft]"
|
||||
puts $f "set geometry(botheight) [winfo height .bleft]"
|
||||
|
||||
|
@ -5800,6 +5800,7 @@ proc showtag {tag isnew} {
|
|||
proc doquit {} {
|
||||
global stopped
|
||||
set stopped 100
|
||||
savestuff .
|
||||
destroy .
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in a new issue