Skip to content

Commit

Permalink
gitk: Prevent parent link from overwriting commit headline
Browse files Browse the repository at this point in the history
When I made drawlineseg responsible for drawing the link to the first
child rather than drawparentlinks, that meant that the right-most X
value computed by drawparentlinks didn't include those first-child
links, and thus the first-child link could go over the top of the
commit headline.  This fixes it.

Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Paul Mackerras committed Mar 30, 2006
1 parent 7b5ff7e commit f340844
Showing 1 changed file with 9 additions and 9 deletions.
18 changes: 9 additions & 9 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -1304,17 +1304,21 @@ proc drawparentlinks {id row col olds} {
# rmx = right-most X coord used
set rmx 0
foreach p $olds {
set i [lsearch -exact $ids $p]
if {$i < 0} {
puts "oops, parent $p of $id not in list"
continue
}
set x2 [xc $row2 $i]
if {$x2 > $rmx} {
set rmx $x2
}
if {[info exists idrowranges($p)] &&
$row2 == [lindex $idrowranges($p) 0] &&
$row2 < [lindex $idrowranges($p) 1]} {
# drawlineseg will do this one for us
continue
}
set i [lsearch -exact $ids $p]
if {$i < 0} {
puts "oops, parent $p of $id not in list"
continue
}
assigncolor $p
# should handle duplicated parents here...
set coords [list $x $y]
Expand All @@ -1323,10 +1327,6 @@ proc drawparentlinks {id row col olds} {
} elseif {$i > $col + 1} {
lappend coords [xc $row [expr {$i - 1}]] $y
}
set x2 [xc $row2 $i]
if {$x2 > $rmx} {
set rmx $x2
}
lappend coords $x2 $y2
set t [$canv create line $coords -width [linewidth $p] \
-fill $colormap($p) -tags lines.$p]
Expand Down

0 comments on commit f340844

Please sign in to comment.