mirror/ git
1
0
Fork 0
mirror of https://github.com/git/git.git synced 2024-05-07 12:46:12 +02:00
Code

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
This commit is contained in:
Junio C Hamano 2022-05-11 08:25:02 -07:00
parent b9de974d38 465f03869a
commit ef9b086d95
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
gitk-git/gitk
View File

@ -2955,9 +2955,9 @@ proc savestuff {w} {
proc resizeclistpanes {win w} { proc resizeclistpanes {win w} {
global oldwidth oldsash use_ttk global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} { if {[info exists oldwidth($win)]} {
if {[info exists oldsash($win)]} { if {[info exists oldsash($win)]} {
set s0 [lindex $oldsash($win) 0] set s0 [lindex $oldsash($win) 0]
set s1 [lindex $oldsash($win) 1] set s1 [lindex $oldsash($win) 1]
} elseif {$use_ttk} { } elseif {$use_ttk} {
set s0 [$win sashpos 0] set s0 [$win sashpos 0]
set s1 [$win sashpos 1] set s1 [$win sashpos 1]
@ -2991,8 +2991,10 @@ proc resizeclistpanes {win w} {
} else { } else {
$win sash place 0 $sash0 [lindex $s0 1] $win sash place 0 $sash0 [lindex $s0 1]
$win sash place 1 $sash1 [lindex $s1 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 set oldwidth($win) $w
} }
@ -3000,8 +3002,8 @@ proc resizeclistpanes {win w} {
proc resizecdetpanes {win w} { proc resizecdetpanes {win w} {
global oldwidth oldsash use_ttk global oldwidth oldsash use_ttk
if {[info exists oldwidth($win)]} { if {[info exists oldwidth($win)]} {
if {[info exists oldsash($win)]} { if {[info exists oldsash($win)]} {
set s0 $oldsash($win) set s0 $oldsash($win)
} elseif {$use_ttk} { } elseif {$use_ttk} {
set s0 [$win sashpos 0] set s0 [$win sashpos 0]
} else { } else {
@ -3023,8 +3025,9 @@ proc resizecdetpanes {win w} {
$win sashpos 0 $sash0 $win sashpos 0 $sash0
} else { } else {
$win sash place 0 $sash0 [lindex $s0 1] $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 set oldwidth($win) $w
} }