[PATCH] gitk: Replaced "green" with "#00FF00".
- From
- Peter Hofmann <git-dev@uninformativ.de>
- Date
- Dec 27, 2012, 12:59 UTC
- Message-ID
- <20121227125916.GC7039@mobiltux>
The definition of "green" has changed in Tk 8.6:
- http://wiki.tcl.tk/21276 - http://www.tcl.tk/cgi-bin/tct/tip/403
gitk looks pretty awkward with Tk 8.6. "green" is simply too dark now because it has changed from "#00FF00" to "#008000".
One could also use "lime" instead of "#00FF00" but that would break compatibility with older versions of Tk.
Signed-off-by: Peter Hofmann <git-dev@uninformativ.de> --- gitk-git/gitk | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/gitk-git/gitk b/gitk-git/gitk index d93bd99..d7e922b 100755 --- a/gitk-git/gitk +++ b/gitk-git/gitk @@ -2209,7 +2209,7 @@ proc makewindow {} { set h [expr {[font metrics uifont -linespace] + 2}] set progresscanv .tf.bar.progress canvas $progresscanv -relief sunken -height $h -borderwidth 2 - set progressitem [$progresscanv create rect -1 0 0 $h -fill green] + set progressitem [$progresscanv create rect -1 0 0 $h -fill "#00FF00"] set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow] set rprogitem [$progresscanv create rect -1 0 0 $h -fill red] } @@ -2342,7 +2342,7 @@ proc makewindow {} { $ctext tag conf dresult -fore [lindex $diffcolors 1] $ctext tag conf m0 -fore red $ctext tag conf m1 -fore blue - $ctext tag conf m2 -fore green + $ctext tag conf m2 -fore "#00FF00" $ctext tag conf m3 -fore purple $ctext tag conf m4 -fore brown $ctext tag conf m5 -fore "#009090" @@ -3226,7 +3226,7 @@ set rectmask { 0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00}; } -image create bitmap reficon-H -background black -foreground green \ +image create bitmap reficon-H -background black -foreground "#00FF00" \ -data $rectdata -maskdata $rectmask image create bitmap reficon-o -background black -foreground "#ddddff" \ -data $rectdata -maskdata $rectmask @@ -5909,7 +5909,7 @@ proc drawcmittext {id row col} { if {$id eq $nullid} { set ofill red } elseif {$id eq $nullid2} { - set ofill green + set ofill "#00FF00" } elseif {$id eq $mainheadid} { set ofill yellow } else { @@ -6377,7 +6377,7 @@ proc drawtags {id x xt y1} { } else { # draw a head or other ref if {[incr nheads -1] >= 0} { - set col green + set col "#00FF00" if {$tag eq $mainhead} { set font mainfontbold } @@ -11617,7 +11617,7 @@ if {[tk windowingsystem] eq "aqua"} { set extdifftool "meld" } -set colors {green red blue magenta darkgrey brown orange} +set colors {"#00FF00" red blue magenta darkgrey brown orange} if {[tk windowingsystem] eq "win32"} { set uicolor SystemButtonFace set bgcolor SystemWindow
-- 1.8.0.2