Skip to content

Commit

Permalink
gitk: Default to the system colours on Windows
Browse files Browse the repository at this point in the history
Also convert a button to use the themed widget set.

Signed-off-by: Pat Thoyts <patthoyts@users.sourceforge.net>
Signed-off-by: Paul Mackerras <paulus@samba.org>
  • Loading branch information
Pat Thoyts authored and Paul Mackerras committed Nov 14, 2009
1 parent 7a0ebbf commit 1924d1b
Showing 1 changed file with 12 additions and 5 deletions.
17 changes: 12 additions & 5 deletions gitk
Original file line number Diff line number Diff line change
Expand Up @@ -10732,7 +10732,7 @@ proc doprefs {} {
${NS}::label $top.cdisp -text [mc "Colors: press to choose"]
grid $top.cdisp - -sticky w -pady 10
label $top.ui -padx 40 -relief sunk -background $uicolor
button $top.uibut -text [mc "Interface"] -font optionfont \
${NS}::button $top.uibut -text [mc "Interface"] \
-command [list choosecolor uicolor {} $top.ui [mc "interface"] setui]
grid x $top.uibut $top.ui -sticky w
label $top.bg -padx 40 -relief sunk -background $bgcolor
Expand Down Expand Up @@ -11350,13 +11350,20 @@ if {[tk windowingsystem] eq "aqua"} {
}

set colors {green red blue magenta darkgrey brown orange}
set uicolor grey85
set bgcolor white
set fgcolor black
if {[tk windowingsystem] eq "win32"} {
set uicolor SystemButtonFace
set bgcolor SystemWindow
set fgcolor SystemButtonText
set selectbgcolor SystemHighlight
} else {
set uicolor grey85
set bgcolor white
set fgcolor black
set selectbgcolor gray85
}
set diffcolors {red "#00a000" blue}
set diffcontext 3
set ignorespace 0
set selectbgcolor gray85
set markbgcolor "#e0e0ff"

set circlecolors {white blue gray blue blue}
Expand Down

0 comments on commit 1924d1b

Please sign in to comment.