On 18/12/20 10:43AM, Stefan Haller wrote:
> This makes it easier to see at a glance which of the four main views has the
> keyboard focus.
>
> Signed-off-by: Stefan Haller <stefan@xxxxxxxxxxxxxxxx>
> ---
> Hi Pratyush,
>
> here's a rerolled version with added Signed-off-by and using local variables for
> inactive_select_bg and inactive_select_bg, hoping this might save you some time.
> Let me know if this is what you had in mind, I wasn't totally sure.
>
> git-gui.sh | 18 ++++++++++++------
> lib/themed.tcl | 35 +++++++++++++++++++++++++----------
> 2 files changed, 37 insertions(+), 16 deletions(-)
>
> diff --git a/git-gui.sh b/git-gui.sh
> index cc6c2aa..201524c 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
>
> diff --git a/lib/themed.tcl b/lib/themed.tcl
> index 244c061..0f6575a 100644
> --- a/lib/themed.tcl
> +++ b/lib/themed.tcl
> @@ -6,19 +6,25 @@ namespace eval color {
> # Variable colors
> # Preffered way to set widget colors is using add_option.
> # In some cases, like with tags in_diff/in_sel, we use these colors.
> - variable select_bg lightgray
> - variable select_fg black
> + variable select_bg lightgray
> + variable select_fg black
> + variable inactive_select_bg lightgray
> + variable inactive_select_fg black
>
> proc sync_with_theme {} {
> - set base_bg [ttk::style lookup . -background]
> - set base_fg [ttk::style lookup . -foreground]
> - set text_bg [ttk::style lookup Treeview -background]
> - set text_fg [ttk::style lookup Treeview -foreground]
> - set select_bg [ttk::style lookup Default -selectbackground]
> - set select_fg [ttk::style lookup Default -selectforeground]
> + set base_bg [ttk::style lookup . -background]
> + set base_fg [ttk::style lookup . -foreground]
> + set text_bg [ttk::style lookup Treeview -background]
> + set text_fg [ttk::style lookup Treeview -foreground]
> + set select_bg [ttk::style lookup Default -selectbackground]
> + set select_fg [ttk::style lookup Default -selectforeground]
> + set inactive_select_bg [convert_rgb_to_gray $select_bg]
> + set inactive_select_fg $select_fg
This has mixed tabs and spaces for alignment. Changed to all tabs
locally. Applied to git-gui/master with this change. Thanks.
--
Regards,
Pratyush Yadav
