From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on dcvr.yhbt.net X-Spam-Level: X-Spam-Status: No, score=-3.4 required=3.0 tests=AWL,BAYES_00, HEADER_FROM_DIFFERENT_DOMAINS,MAILING_LIST_MULTI,SPF_HELO_PASS, SPF_PASS shortcircuit=no autolearn=ham autolearn_force=no version=3.4.2 Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by dcvr.yhbt.net (Postfix) with ESMTP id 2721B1F4B4 for ; Fri, 18 Dec 2020 19:47:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1733262AbgLRTrE (ORCPT ); Fri, 18 Dec 2020 14:47:04 -0500 Received: from relay3-d.mail.gandi.net ([217.70.183.195]:45329 "EHLO relay3-d.mail.gandi.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726177AbgLRTrD (ORCPT ); Fri, 18 Dec 2020 14:47:03 -0500 X-Originating-IP: 103.82.80.9 Received: from localhost (unknown [103.82.80.9]) (Authenticated sender: me@yadavpratyush.com) by relay3-d.mail.gandi.net (Postfix) with ESMTPSA id D5D3560003; Fri, 18 Dec 2020 19:46:20 +0000 (UTC) Date: Sat, 19 Dec 2020 01:16:18 +0530 From: Pratyush Yadav To: Stefan Haller Cc: serg.partizan@gmail.com, git@vger.kernel.org Subject: Re: [PATCH v3] git-gui: use gray background for inactive text widgets Message-ID: <20201218194618.ehwijoyiboluonzf@yadavpratyush.com> References: <20201217214912.ycp7bidcyqwzslxy@yadavpratyush.com> <20201218094314.22138-1-stefan@haller-berlin.de> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20201218094314.22138-1-stefan@haller-berlin.de> Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org 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 > --- > 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 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 { set_selection_colors %W 1 } > + bind $i { 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