summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2022-05-11 15:25:02 (GMT)
committerJunio C Hamano <gitster@pobox.com>2022-05-11 15:25:02 (GMT)
commitef9b086d95e4f6676d588f4b0deebeaa76bf2a41 (patch)
treed8604be07f1b6888013edeb00ce32b4d5548da65
parentb9de974d38d42c3a735cc05acb308b61e80aa819 (diff)
parent465f03869ae11acd04abfa1b83c67879c867410c (diff)
downloadgit-ef9b086d95e4f6676d588f4b0deebeaa76bf2a41.zip
git-ef9b086d95e4f6676d588f4b0deebeaa76bf2a41.tar.gz
git-ef9b086d95e4f6676d588f4b0deebeaa76bf2a41.tar.bz2
Merge branch 'master' of git://git.ozlabs.org/~paulus/gitk
* 'master' of git://git.ozlabs.org/~paulus/gitk: gitk: include y coord in recorded sash position gitk: trivial indentation fix
-rwxr-xr-xgitk-git/gitk17
1 files changed, 10 insertions, 7 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk
index 23d9dd1..0ae7d68 100755
--- a/gitk-git/gitk
+++ b/gitk-git/gitk
@@ -2955,9 +2955,9 @@ proc savestuff {w} {
proc resizeclistpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 [lindex $oldsash($win) 0]
- set s1 [lindex $oldsash($win) 1]
+ if {[info exists oldsash($win)]} {
+ set s0 [lindex $oldsash($win) 0]
+ set s1 [lindex $oldsash($win) 1]
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
set s1 [$win sashpos 1]
@@ -2991,8 +2991,10 @@ proc resizeclistpanes {win w} {
} else {
$win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 1]
+ set sash0 [list $sash0 [lindex $s0 1]]
+ set sash1 [list $sash1 [lindex $s1 1]]
}
- set oldsash($win) [list $sash0 $sash1]
+ set oldsash($win) [list $sash0 $sash1]
}
set oldwidth($win) $w
}
@@ -3000,8 +3002,8 @@ proc resizeclistpanes {win w} {
proc resizecdetpanes {win w} {
global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} {
- if {[info exists oldsash($win)]} {
- set s0 $oldsash($win)
+ if {[info exists oldsash($win)]} {
+ set s0 $oldsash($win)
} elseif {$use_ttk} {
set s0 [$win sashpos 0]
} else {
@@ -3023,8 +3025,9 @@ proc resizecdetpanes {win w} {
$win sashpos 0 $sash0
} else {
$win sash place 0 $sash0 [lindex $s0 1]
+ set sash0 [list $sash0 [lindex $s0 1]]
}
- set oldsash($win) $sash0
+ set oldsash($win) $sash0
}
set oldwidth($win) $w
}