git-gui: if a background colour is set, set foreground colour as well

In several places, only the background colour is set to an explicit
value, sometimes even "white".  This does not work well with dark
colour themes.

This patch tries to set the foreground colour to "black" in those
situations, where an explicit background colour is set without defining
any foreground colour.

Signed-off-by: Philipp A. Hartmann <ph@sorgh.de>
Signed-off-by: Shawn O. Pearce <spearce@spearce.org>

diff --git a/git-gui.sh b/git-gui.sh
index 238a2393ff7811675003e0e846f3d9409fb04e0c..874144397c4661fdcd107e060555ae5897ae004e 100755 (executable)
--- a/git-gui.sh
+++ b/git-gui.sh
@@ -2289,8 +2289,9 @@ pack .vpane -anchor n -side top -fill both -expand 1
 #
 frame .vpane.files.index -height 100 -width 200
 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \
 #
 frame .vpane.files.index -height 100 -width 200
 label .vpane.files.index.title -text [mc "Staged Changes (Will Commit)"] \

-       -background lightgreen
-text $ui_index -background white -borderwidth 0 \
+       -background lightgreen -foreground black
+text $ui_index -background white -foreground black \
+       -borderwidth 0 \

        -width 20 -height 10 \
        -wrap none \
        -cursor $cursor_ptr \
        -width 20 -height 10 \
        -wrap none \
        -cursor $cursor_ptr \


@@ -2308,8 +2309,9 @@ pack $ui_index -side left -fill both -expand 1
 #
 frame .vpane.files.workdir -height 100 -width 200
 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \
 #
 frame .vpane.files.workdir -height 100 -width 200
 label .vpane.files.workdir.title -text [mc "Unstaged Changes"] \

-       -background lightsalmon
-text $ui_workdir -background white -borderwidth 0 \
+       -background lightsalmon -foreground black
+text $ui_workdir -background white -foreground black \
+       -borderwidth 0 \

        -width 20 -height 10 \
        -wrap none \
        -cursor $cursor_ptr \
        -width 20 -height 10 \
        -wrap none \
        -cursor $cursor_ptr \


@@ -2416,7 +2418,8 @@ pack $ui_coml -side left -fill x
 pack .vpane.lower.commarea.buffer.header.amend -side right
 pack .vpane.lower.commarea.buffer.header.new -side right
 
 pack .vpane.lower.commarea.buffer.header.amend -side right
 pack .vpane.lower.commarea.buffer.header.new -side right
 

-text $ui_comm -background white -borderwidth 1 \
+text $ui_comm -background white -foreground black \
+       -borderwidth 1 \

        -undo true \
        -maxundo 20 \
        -autoseparators true \
        -undo true \
        -maxundo 20 \
        -autoseparators true \


@@ -2493,15 +2496,18 @@ trace add variable current_diff_path write trace_current_diff_path
 frame .vpane.lower.diff.header -background gold
 label .vpane.lower.diff.header.status \
        -background gold \
 frame .vpane.lower.diff.header -background gold
 label .vpane.lower.diff.header.status \
        -background gold \

+       -foreground black \

        -width $max_status_desc \
        -anchor w \
        -justify left
 label .vpane.lower.diff.header.file \
        -background gold \
        -width $max_status_desc \
        -anchor w \
        -justify left
 label .vpane.lower.diff.header.file \
        -background gold \

+       -foreground black \

        -anchor w \
        -justify left
 label .vpane.lower.diff.header.path \
        -background gold \
        -anchor w \
        -justify left
 label .vpane.lower.diff.header.path \
        -background gold \

+       -foreground black \

        -anchor w \
        -justify left
 pack .vpane.lower.diff.header.status -side left
        -anchor w \
        -justify left
 pack .vpane.lower.diff.header.status -side left


@@ -2525,7 +2531,8 @@ bind_button3 .vpane.lower.diff.header.path "tk_popup $ctxm %X %Y"
 #
 frame .vpane.lower.diff.body
 set ui_diff .vpane.lower.diff.body.t
 #
 frame .vpane.lower.diff.body
 set ui_diff .vpane.lower.diff.body.t

-text $ui_diff -background white -borderwidth 0 \
+text $ui_diff -background white -foreground black \
+       -borderwidth 0 \

        -width 80 -height 15 -wrap none \
        -font font_diff \
        -xscrollcommand {.vpane.lower.diff.body.sbx set} \
        -width 80 -height 15 -wrap none \
        -font font_diff \
        -xscrollcommand {.vpane.lower.diff.body.sbx set} \

diff --git a/lib/blame.tcl b/lib/blame.tcl
index 00ecf21333c976d4c6002cd66a055803362f3523..92fac1bad402a0d7772af0b8817217555b61b6c7 100644 (file)
--- a/lib/blame.tcl
+++ b/lib/blame.tcl
@@ -80,6 +80,7 @@ constructor new {i_commit i_path} {
        label $w.header.commit_l \
                -text [mc "Commit:"] \
                -background gold \
        label $w.header.commit_l \
                -text [mc "Commit:"] \
                -background gold \

+               -foreground black \

                -anchor w \
                -justify left
        set w_back $w.header.commit_b
                -anchor w \
                -justify left
        set w_back $w.header.commit_b


@@ -89,6 +90,7 @@ constructor new {i_commit i_path} {
                -relief flat \
                -state disabled \
                -background gold \
                -relief flat \
                -state disabled \
                -background gold \

+               -foreground black \

                -activebackground gold
        bind $w_back <Button-1> "
                if {\[$w_back cget -state\] eq {normal}} {
                -activebackground gold
        bind $w_back <Button-1> "
                if {\[$w_back cget -state\] eq {normal}} {


@@ -98,16 +100,19 @@ constructor new {i_commit i_path} {
        label $w.header.commit \
                -textvariable @commit \
                -background gold \
        label $w.header.commit \
                -textvariable @commit \
                -background gold \

+               -foreground black \

                -anchor w \
                -justify left
        label $w.header.path_l \
                -text [mc "File:"] \
                -background gold \
                -anchor w \
                -justify left
        label $w.header.path_l \
                -text [mc "File:"] \
                -background gold \

+               -foreground black \

                -anchor w \
                -justify left
        set w_path $w.header.path
        label $w_path \
                -background gold \
                -anchor w \
                -justify left
        set w_path $w.header.path
        label $w_path \
                -background gold \

+               -foreground black \

                -anchor w \
                -justify left
        pack $w.header.commit_l -side left
                -anchor w \
                -justify left
        pack $w.header.commit_l -side left


@@ -135,7 +140,9 @@ constructor new {i_commit i_path} {
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \

-               -background white -borderwidth 0 \
+               -background white \
+               -foreground black \
+               -borderwidth 0 \

                -state disabled \
                -wrap none \
                -height 40 \
                -state disabled \
                -wrap none \
                -height 40 \


@@ -148,7 +155,9 @@ constructor new {i_commit i_path} {
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \

-               -background white -borderwidth 0 \
+               -background white \
+               -foreground black \
+               -borderwidth 0 \

                -state disabled \
                -wrap none \
                -height 40 \
                -state disabled \
                -wrap none \
                -height 40 \


@@ -166,7 +175,9 @@ constructor new {i_commit i_path} {
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \

-               -background white -borderwidth 0 \
+               -background white \
+               -foreground black \
+               -borderwidth 0 \

                -state disabled \
                -wrap none \
                -height 40 \
                -state disabled \
                -wrap none \
                -height 40 \


@@ -184,7 +195,9 @@ constructor new {i_commit i_path} {
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \
                -takefocus 0 \
                -highlightthickness 0 \
                -padx 0 -pady 0 \

-               -background white -borderwidth 0 \
+               -background white \
+               -foreground black \
+               -borderwidth 0 \

                -state disabled \
                -wrap none \
                -height 40 \
                -state disabled \
                -wrap none \
                -height 40 \


@@ -213,7 +226,9 @@ constructor new {i_commit i_path} {
 
        set w_cviewer $w.file_pane.cm.t
        text $w_cviewer \
 
        set w_cviewer $w.file_pane.cm.t
        text $w_cviewer \

-               -background white -borderwidth 0 \
+               -background white \
+               -foreground black \
+               -borderwidth 0 \

                -state disabled \
                -wrap none \
                -height 10 \
                -state disabled \
                -wrap none \
                -height 10 \

diff --git a/lib/browser.tcl b/lib/browser.tcl
index 53d5a628165a29c592ab14c234a000a56d7c6a12..ab470d12648c1dd3560b411e70ea210cc4381e3e 100644 (file)
--- a/lib/browser.tcl
+++ b/lib/browser.tcl
@@ -39,7 +39,8 @@ constructor new {commit {path {}}} {
 
        frame $w.list
        set w_list $w.list.l
 
        frame $w.list
        set w_list $w.list.l

-       text $w_list -background white -borderwidth 0 \
+       text $w_list -background white -foreground black \
+               -borderwidth 0 \

                -cursor $cursor_ptr \
                -state disabled \
                -wrap none \
                -cursor $cursor_ptr \
                -state disabled \
                -wrap none \

diff --git a/lib/choose_font.tcl b/lib/choose_font.tcl
index 0c4051b3752b4f88e50e1f4f22189d826234668a..56443b042c62bc10765aaf6484ad1077a843cb30 100644 (file)
--- a/lib/choose_font.tcl
+++ b/lib/choose_font.tcl
@@ -55,6 +55,7 @@ constructor pick {path title a_family a_size} {
        set w_family $w.inner.family.v
        text $w_family \
                -background white \
        set w_family $w.inner.family.v
        text $w_family \
                -background white \

+               -foreground black \

                -borderwidth 1 \
                -relief sunken \
                -cursor $::cursor_ptr \
                -borderwidth 1 \
                -relief sunken \
                -cursor $::cursor_ptr \


@@ -92,6 +93,7 @@ constructor pick {path title a_family a_size} {
        set w_example $w.example.t
        text $w_example \
                -background white \
        set w_example $w.example.t
        text $w_example \
                -background white \

+               -foreground black \

                -borderwidth 1 \
                -relief sunken \
                -height 3 \
                -borderwidth 1 \
                -relief sunken \
                -height 3 \

diff --git a/lib/console.tcl b/lib/console.tcl
index 5597188d803a1c8217011412a39c14fbbeaf0b3a..c112464ec367a2db707a3f28ff6c588aefe7985f 100644 (file)
--- a/lib/console.tcl
+++ b/lib/console.tcl
@@ -46,7 +46,9 @@ method _init {} {
                -justify left \
                -font font_uibold
        text $w_t \
                -justify left \
                -font font_uibold
        text $w_t \

-               -background white -borderwidth 1 \
+               -background white \
+               -foreground black \
+               -borderwidth 1 \

                -relief sunken \
                -width 80 -height 10 \
                -wrap none \
                -relief sunken \
                -width 80 -height 10 \
                -wrap none \


@@ -180,7 +182,8 @@ method done {ok} {
        if {$ok} {
                if {[winfo exists $w.m.s]} {
                        bind $w.m.s <Destroy> [list delete_this $this]
        if {$ok} {
                if {[winfo exists $w.m.s]} {
                        bind $w.m.s <Destroy> [list delete_this $this]

-                       $w.m.s conf -background green -text [mc "Success"]
+                       $w.m.s conf -background green -foreground black \
+                               -text [mc "Success"]

                        if {$is_toplevel} {
                                $w.ok conf -state normal
                                focus $w.ok
                        if {$is_toplevel} {
                                $w.ok conf -state normal
                                focus $w.ok


@@ -193,7 +196,8 @@ method done {ok} {
                        _init $this
                }
                bind $w.m.s <Destroy> [list delete_this $this]
                        _init $this
                }
                bind $w.m.s <Destroy> [list delete_this $this]

-               $w.m.s conf -background red -text [mc "Error: Command Failed"]
+               $w.m.s conf -background red -foreground black \
+                       -text [mc "Error: Command Failed"]

                if {$is_toplevel} {
                        $w.ok conf -state normal
                        focus $w.ok
                if {$is_toplevel} {
                        $w.ok conf -state normal
                        focus $w.ok

diff --git a/lib/error.tcl b/lib/error.tcl
index 8c27678e3a45c011cfc6a21f5d53b0d87c66b4a6..75650157e551e34dab650d89f3fa6d25afc91d6a 100644 (file)
--- a/lib/error.tcl
+++ b/lib/error.tcl
@@ -80,7 +80,9 @@ proc hook_failed_popup {hook msg {is_fatal 1}} {
                -justify left \
                -font font_uibold
        text $w.m.t \
                -justify left \
                -font font_uibold
        text $w.m.t \

-               -background white -borderwidth 1 \
+               -background white \
+               -foreground black \
+               -borderwidth 1 \

                -relief sunken \
                -width 80 -height 10 \
                -font font_diff \
                -relief sunken \
                -width 80 -height 10 \
                -font font_diff \