Skip to content

Commit 66db14c

Browse files
committed
gitk: Color name update
Color name "green" was darken since Tcl/Tk 7.6. Because color name scheme was changed from "X11 colors" to "Web colors". Use "lime" to keep colors. See also: http://www.tcl.tk/cgi-bin/tct/tip/403.html Signed-off-by: YOKOTA Hiroshi <[email protected]>
1 parent d70c034 commit 66db14c

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

gitk

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -2251,7 +2251,7 @@ proc makewindow {} {
22512251
set h [expr {[font metrics uifont -linespace] + 2}]
22522252
set progresscanv .tf.bar.progress
22532253
canvas $progresscanv -relief sunken -height $h -borderwidth 2
2254-
set progressitem [$progresscanv create rect -1 0 0 $h -fill green]
2254+
set progressitem [$progresscanv create rect -1 0 0 $h -fill lime]
22552255
set fprogitem [$progresscanv create rect -1 0 0 $h -fill yellow]
22562256
set rprogitem [$progresscanv create rect -1 0 0 $h -fill red]
22572257
}
@@ -3379,7 +3379,7 @@ set rectmask {
33793379
0x00, 0x00, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f,
33803380
0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0xfc, 0x0f, 0x00, 0x00};
33813381
}
3382-
image create bitmap reficon-H -background black -foreground green \
3382+
image create bitmap reficon-H -background black -foreground lime \
33833383
-data $rectdata -maskdata $rectmask
33843384
image create bitmap reficon-o -background black -foreground "#ddddff" \
33853385
-data $rectdata -maskdata $rectmask
@@ -12170,7 +12170,7 @@ if {[tk windowingsystem] eq "aqua"} {
1217012170
set extdifftool "meld"
1217112171
}
1217212172

12173-
set colors {green red blue magenta darkgrey brown orange}
12173+
set colors {lime red blue magenta darkgrey brown orange}
1217412174
if {[tk windowingsystem] eq "win32"} {
1217512175
set uicolor SystemButtonFace
1217612176
set uifgcolor SystemButtonText
@@ -12188,12 +12188,12 @@ if {[tk windowingsystem] eq "win32"} {
1218812188
}
1218912189
set diffcolors {red "#00a000" blue}
1219012190
set diffcontext 3
12191-
set mergecolors {red blue green purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
12191+
set mergecolors {red blue lime purple brown "#009090" magenta "#808000" "#009000" "#ff0080" cyan "#b07070" "#70b0f0" "#70f0b0" "#f0b070" "#ff70b0"}
1219212192
set ignorespace 0
1219312193
set worddiff ""
1219412194
set markbgcolor "#e0e0ff"
1219512195

12196-
set headbgcolor green
12196+
set headbgcolor lime
1219712197
set headfgcolor black
1219812198
set headoutlinecolor black
1219912199
set remotebgcolor #ffddaa
@@ -12208,7 +12208,7 @@ set linehoverfgcolor black
1220812208
set linehoveroutlinecolor black
1220912209
set mainheadcirclecolor yellow
1221012210
set workingfilescirclecolor red
12211-
set indexcirclecolor green
12211+
set indexcirclecolor lime
1221212212
set circlecolors {white blue gray blue blue}
1221312213
set linkfgcolor blue
1221412214
set circleoutlinecolor $fgcolor

0 commit comments

Comments
 (0)