Junio C HamanoFrom: Mark Levedahl <mdl123@verizon.net> Date: Mon, 05 Feb 2007 22:59:50 -0500
gitk was saving widget sizes and positions when the main window was destroyed, which is after all child widgets are destroyed. Tk resizes container widgets as children are destroyed, so the saved main window information was not as the user left the window. This patch causes the info to be saved before the first child widget is destroyed. Also, use wm geometry rather than winfo geometry (both work on Windows, on Linux they give different answers and the former is correct).
Signed-off-by: Mark Levedahl <mdl123@verizon.net> --- * Somehow this did not appeared on the list, so I am forwarding.
After seeing what this patch has to do, I feel dirty, but that is not Mark's fault -- rather it is Tk's.
I am tempted to suggest adding an explicit "Save window configuration" action on the menubar and forget about resurrecting the window configuration immediately before the end of the last session.
gitk | 20 ++++++++++++++++++-- 1 files changed, 18 insertions(+), 2 deletions(-)
Show changes to gitk +18 −2
diff --git a/gitk b/gitk index 8132812..beec6a9 100755 --- a/gitk +++ b/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} + bindalldestroy . bind . <Button-1> "click %W" bind $fstring <Key-Return> dofind bind $sha1entry <Key-Return> gotocommit @@ -759,6 +759,22 @@ proc makewindow {} { -command rmbranch } +# The main window resizes itself while the windows are being destroyed, +# we want to save the size before it is resized so we write out when the +# first widget with no children is destroyed. We don't know which this +# will be, so we bind all child widgets (savestuff will save only once, +# the remaining calls are ignored). +proc bindalldestroy {w} { + set children [winfo children $w] + if {"$children" == ""} { + bind $w <Destroy> {savestuff %W} + } else { + foreach child $children { + bindalldestroy $child + } + } +} + # mouse-2 makes all windows scan vertically, but only the one # the cursor is in scans horizontally proc canvscan {op w x y} { @@ -829,7 +845,7 @@ 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}]"
-- 1.5.0.rc3.24.g0c5e
