[PATCH 03/13] gitk: use a type "tags" to indicate abbreviated tags

[Michael Haggerty]

This replaces the functionality of the old `singletag` variable.

Signed-off-by: Michael Haggerty <mhag...@alum.mit.edu>
---
 gitk | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/gitk b/gitk
index 7c830c3..502f0aa 100755
--- a/gitk
+++ b/gitk
@@ -6561,7 +6561,6 @@ proc drawtags {id x xt y1} {
 
     set marks {}
     set types {}
-    set singletag 0
     set maxtags 3
     set maxtagpct 25
     set maxwidth [expr {[graph_pane_width] * $maxtagpct / 100}]
@@ -6574,8 +6573,7 @@ proc drawtags {id x xt y1} {
        if {$ntags > $maxtags ||
            [totalwidth $tags mainfont $extra] > $maxwidth} {
            # show just a single "n tags..." tag
-           set singletag 1
-           lappend types tag
+           lappend types tags
            if {$ntags == 1} {
                lappend marks "tag..."
            } else {
@@ -6626,13 +6624,13 @@ proc drawtags {id x xt y1} {
        set xl [expr {$x + $delta}]
        set xr [expr {$x + $delta + $wid + $lthickness}]
        set font mainfont
-       if {$type eq "tag"} {
+       if {$type eq "tag" || $type eq "tags"} {
            # draw a tag
            set t [$canv create polygon $x [expr {$yt + $delta}] $xl $yt \
                       $xr $yt $xr $yb $xl $yb $x [expr {$yb - $delta}] \
                       -width 1 -outline $tagoutlinecolor -fill $tagbgcolor \
                       -tags tag.$id]
-           if {$singletag} {
+           if {$type eq "tags"} {
                set tagclick [list showtags $id 1]
            } else {
                set tagclick [list showtag $tag_quoted 1]
@@ -6663,7 +6661,7 @@ proc drawtags {id x xt y1} {
        }
        set t [$canv create text $xl $y1 -anchor w -text $tag -fill 
$headfgcolor \
                   -font $font -tags [list tag.$id text]]
-       if {$type eq "tag"} {
+       if {$type eq "tag" || $type eq "tags"} {
            $canv bind $t <1> $tagclick
        } elseif {$type eq "head"} {
            $canv bind $t $ctxbut [list headmenu %X %Y $id $tag_quoted]
-- 
2.9.3