From: Michael Rappazzo <rappazzo@gmail•com>
To: git@vger•kernel.org
Cc: j6t@kdbg•org, Michael Rappazzo <rappazzo@gmail•com>
Subject: [PATCH v3 2/2] gitk: make Tags and Heads window geometry sticky
Date: Sun, 28 Sep 2025 09:54:35 -0400 [thread overview]
Message-ID: <20250928135435.59623-3-rappazzo@gmail.com> (raw)
In-Reply-To: <20250928135435.59623-1-rappazzo@gmail.com>
Currently, the Tags and Heads window always opens at a default position
and size, requiring users to reposition it each time. This patch makes
the window remember its geometry between sessions.
This change saves and restores the Tags and Heads window size and position
relative to the main gitk window. The geometry is stored in the config file
as `geometry(showrefs)` and persists between gitk sessions. The window
position is stored relative to the main window, so it maintains the same
spatial relationship when the main window is moved or when gitk is restarted
on different monitors.
Signed-off-by: Michael Rappazzo <rappazzo@gmail•com>
---
gitk | 39 +++++++++++++++++++++++++++++++++++++--
1 file changed, 37 insertions(+), 2 deletions(-)
diff --git a/gitk b/gitk
index 275f353811..79a6dcdb4c 100755
--- a/gitk
+++ b/gitk
@@ -3106,6 +3106,11 @@ proc savestuff {w} {
puts $f "set geometry(pwsash1) \"[.tf.histframe.pwclist sashpos 1] 1\""
puts $f "set geometry(botwidth) [winfo width .bleft]"
puts $f "set geometry(botheight) [winfo height .bleft]"
+ if {[winfo exists .showrefs]} {
+ puts $f "set geometry(showrefs) \"[wm geometry .showrefs]\""
+ } elseif {[info exists geometry(showrefs)]} {
+ puts $f "set geometry(showrefs) \"$geometry(showrefs)\""
+ }
array set view_save {}
array set views {}
@@ -10199,11 +10204,13 @@ proc showrefs {} {
if {[winfo exists $top]} {
raise $top
refill_reflist
+ wm protocol $top WM_DELETE_WINDOW [list destroy_showrefs $top]
return
}
ttk_toplevel $top
wm title $top [mc "Tags and heads: %s" [file tail [pwd]]]
make_transient $top .
+ wm protocol $top WM_DELETE_WINDOW [list destroy_showrefs $top]
text $top.list -background $bgcolor -foreground $fgcolor \
-selectbackground $selectbgcolor -font mainfont \
-xscrollcommand "$top.xsb set" -yscrollcommand "$top.ysb set" \
@@ -10229,8 +10236,8 @@ proc showrefs {} {
ttk::checkbutton $top.sort -text [mc "Sort refs by type"] \
-variable sortrefsbytype -command {refill_reflist}
grid $top.sort - -sticky w -pady 2
- ttk::button $top.close -command [list destroy $top] -text [mc "Close"]
- bind $top <Key-Escape> [list destroy $top]
+ ttk::button $top.close -command [list destroy_showrefs $top] -text [mc "Close"]
+ bind $top <Key-Escape> [list destroy_showrefs $top]
grid $top.close -
grid columnconfigure $top 0 -weight 1
grid rowconfigure $top 0 -weight 1
@@ -10239,6 +10246,9 @@ proc showrefs {} {
bind $top.list <ButtonRelease-1> {sel_reflist %W %x %y; break}
set reflist {}
refill_reflist
+ # Restore geometry after the window is fully created and mapped
+ # Delay Configure binding to avoid overwriting restored geometry
+ bind $top <Map> [list after idle [list setup_showrefs_geometry_tracking $top]]
}
proc sel_reflist {w x y} {
@@ -10271,6 +10281,31 @@ proc reflistfilter_change {n1 n2 op} {
after 200 refill_reflist
}
+proc save_showrefs_geometry {top} {
+ global geometry
+ if {[winfo exists $top]} {
+ set geometry(showrefs) [wm geometry $top]
+ }
+}
+
+proc restore_showrefs_geometry {top} {
+ global geometry
+ if {[info exists geometry(showrefs)] && [winfo exists $top]} {
+ wm geometry $top $geometry(showrefs)
+ }
+}
+
+proc setup_showrefs_geometry_tracking {top} {
+ restore_showrefs_geometry $top
+ bind $top <Configure> [list save_showrefs_geometry $top]
+}
+
+proc destroy_showrefs {top} {
+ save_showrefs_geometry $top
+ savestuff .
+ destroy $top
+}
+
proc refill_reflist {} {
global reflist reflistfilter showrefstop headids tagids otherrefids sortrefsbytype
global curview upstreamofref
--
2.51.0
next prev parent reply other threads:[~2025-09-28 13:54 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-09-28 13:54 [PATCH v3 0/2] gitk: make Tags and Heads window geometry sticky Michael Rappazzo
2025-09-28 13:54 ` [PATCH v3 1/2] Revert "gitk: Only restore window size from ~/.gitk, not position" Michael Rappazzo
2025-09-28 14:17 ` Mark Levedahl
2025-09-28 15:01 ` Mike Rappazzo
2025-10-17 16:36 ` Johannes Sixt
2025-10-17 19:27 ` Mark Levedahl
2025-09-28 15:49 ` Junio C Hamano
2025-09-28 13:54 ` Michael Rappazzo [this message]
2025-09-28 15:57 ` [PATCH v3 2/2] gitk: make Tags and Heads window geometry sticky Junio C Hamano
2025-10-04 17:36 ` Johannes Sixt
2025-10-04 22:04 ` [PATCH] gitk: persist position and size of the Tags and Heads window Johannes Sixt
2025-10-06 15:29 ` [PATCH v2] " Johannes Sixt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250928135435.59623-3-rappazzo@gmail.com \
--to=rappazzo@gmail$(echo .)com \
--cc=git@vger$(echo .)kernel.org \
--cc=j6t@kdbg$(echo .)org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox