diff options
| author | Pratyush Yadav <me@yadavpratyush.com> | 2020-12-19 01:02:34 +0530 |
|---|---|---|
| committer | Pratyush Yadav <me@yadavpratyush.com> | 2020-12-19 01:02:34 +0530 |
| commit | 7b0cfe156e1f1fbb77ab35d55d48eef41625944d (patch) | |
| tree | fb01f19e915745d88eaafc1b2bf9e7c673d75148 /git-gui.sh | |
| parent | 62aed982fdc8a961ae8addfad339e8dfcd28b248 (diff) | |
| parent | da4d86da97a316413cf25bef99332525dbfb4d59 (diff) | |
| download | git-7b0cfe156e1f1fbb77ab35d55d48eef41625944d.tar.xz | |
Merge branch 'sh/inactive-background'
Set a different background color for selections in inactive widgets.
This inactive color is calculated from the current theme colors to make
sure it works for all themes.
* sh/inactive-background:
git-gui: use gray background for inactive text widgets
Diffstat (limited to 'git-gui.sh')
| -rwxr-xr-x | git-gui.sh | 18 |
1 files changed, 12 insertions, 6 deletions
diff --git a/git-gui.sh b/git-gui.sh index cc6c2aa2c3..201524c34e 100755 --- a/git-gui.sh +++ b/git-gui.sh @@ -720,9 +720,6 @@ proc rmsel_tag {text} { -background [$text cget -background] \ -foreground [$text cget -foreground] \ -borderwidth 0 - $text tag conf in_sel\ - -background $color::select_bg \ - -foreground $color::select_fg bind $text <Motion> break return $text } @@ -3328,11 +3325,20 @@ if {!$use_ttk} { .vpane.files paneconfigure .vpane.files.index -sticky news } +proc set_selection_colors {w has_focus} { + foreach tag [list in_diff in_sel] { + $w tag conf $tag \ + -background [expr {$has_focus ? $color::select_bg : $color::inactive_select_bg}] \ + -foreground [expr {$has_focus ? $color::select_fg : $color::inactive_select_fg}] + } +} + foreach i [list $ui_index $ui_workdir] { rmsel_tag $i - $i tag conf in_diff \ - -background $color::select_bg \ - -foreground $color::select_fg + + set_selection_colors $i 0 + bind $i <FocusIn> { set_selection_colors %W 1 } + bind $i <FocusOut> { set_selection_colors %W 0 } } unset i |