diff options
Diffstat (limited to 'gitk-git/gitk')
| -rwxr-xr-x | gitk-git/gitk | 23 |
1 files changed, 16 insertions, 7 deletions
diff --git a/gitk-git/gitk b/gitk-git/gitk index 7f62c8041d..2730274966 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -6831,17 +6831,19 @@ proc drawtags {id x xt y1} { } else { # draw a head or other ref if {[incr nheads -1] >= 0} { - set col $headbgcolor + set refoutlinecol $headoutlinecolor + set reffillcol $headbgcolor if {$tag eq $mainhead} { set font mainfontbold } } else { - set col "#ddddff" + set refoutlinecol black + set reffillcol "#ddddff" } set xl [expr {$xl - $delta/2}] $canv create polygon $x $yt $xr $yt $xr $yb $x $yb \ - -width 1 -outline black -fill $col -tags tag.$id - if {[regexp {^(remotes/.*/|remotes/)} $tag match remoteprefix]} { + -width 1 -outline $refoutlinecol -fill $reffillcol -tags tag.$id + if {[regexp {^(remotes/[^/]*/|remotes/)} $tag match remoteprefix]} { set rwid [font measure mainfont $remoteprefix] set xi [expr {$x + 1}] set yti [expr {$yt + 1}] @@ -6850,7 +6852,8 @@ proc drawtags {id x xt y1} { -width 0 -fill $remotebgcolor -tags tag.$id } } - set t [$canv create text $xl $y1 -anchor w -text $tag -fill $headfgcolor \ + set textfgcolor [expr {$ntags >= 0 ? $tagfgcolor : $headfgcolor}] + set t [$canv create text $xl $y1 -anchor w -text $tag -fill $textfgcolor \ -font $font -tags [list tag.$id text]] if {$ntags >= 0} { $canv bind $t <1> $tagclick @@ -11796,7 +11799,7 @@ proc prefspage_general {notebook} { proc prefspage_colors {notebook} { global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor - global diffbgcolors + global diffbgcolors linkfgcolor global themeloader set page [create_prefs_page $notebook.colors] @@ -11873,6 +11876,11 @@ proc prefspage_colors {notebook} { -command [list choosecolor selectbgcolor {} $page [mc "background"]] grid x $page.selbgbut $page.selbgsep -sticky w + label $page.linkfg -padx 40 -relief sunk -background $linkfgcolor + ttk::button $page.linkfgbut -text [mc "Link"] \ + -command [list choosecolor linkfgcolor {} $page [mc "link"]] + grid x $page.linkfgbut $page.linkfg -sticky w + grid columnconfigure $page 2 -weight 1 return $page @@ -11880,7 +11888,7 @@ proc prefspage_colors {notebook} { proc prefspage_set_colorswatches {page} { global bgcolor fgcolor ctext diffcolors selectbgcolor markbgcolor - global diffbgcolors + global diffbgcolors linkfgcolor $page.bg configure -background $bgcolor $page.fg configure -background $fgcolor @@ -11891,6 +11899,7 @@ proc prefspage_set_colorswatches {page} { $page.hunksep configure -background [lindex $diffcolors 2] $page.markbgsep configure -background $markbgcolor $page.selbgsep configure -background $selectbgcolor + $page.linkfg configure -background $linkfgcolor } proc prefspage_fonts {notebook} { |