Re: [PATCH] git-gui: use gray selection background for inactive text widgets
- From
Stefan Haller <stefan@haller-berlin.de>
- Date
- Nov 23, 2020, 19:03 UTC
- Message-ID
- <23d6eb6c-4c7b-b9dd-d0df-fe0feaa0dc17@haller-berlin.de>
- In-Reply-To
- <JE39KQ.T4FA61XF34XT3@gmail.com>
On 23.11.20 14:13, serg.partizan@gmail.com wrote:
Show 19 quoted lines
> > > On Mon, Nov 23, 2020 at 12:48, Stefan Haller <stefan@haller-berlin.de> > wrote: >> On 22.11.20 18:16, serg.partizan@gmail.com wrote: >>> I think calculating that gray color from current selection bg is too much work >>> for just one color. >>> >>> We can just set inactiveSelectBackground to some neutral gray color like >>> #707070 or #909090 which will work fine with both dark and light themes. >> >> OK, fine with me. Here's a patch that does this (it sits on top of >> yours). It almost works, except for one problem: on Mac, the >> inactive selection background is white instead of lightgray, but >> only for the diff view; for the commit editor it's correct. On >> Windows it's also correct for both views. I can't figure out what's >> the difference on Mac; do you have an idea what could be wrong? >> > I have no idea. Can confirm on linux it works as expected.
That's too bad, as I don't think the patch is acceptable with this defect. I could maybe see if I can find something by reading the Tk sources, but I'm not really sure where to start, to be honest. Any suggestions appreciated.
Show 17 quoted lines
>> diff --git a/git-gui.sh b/git-gui.sh
>> index 867b8ce..a8c5cad 100755
>> --- a/git-gui.sh
>> +++ b/git-gui.sh
>> @@ -3325,8 +3325,25 @@ if {!$use_ttk} {
>> foreach i [list $ui_index $ui_workdir] {
>> rmsel_tag $i
>> $i tag conf in_diff \
>> - -background $color::select_bg \
>> - -foreground $color::select_fg
>> + -background $color::inactive_select_bg \
>> + -foreground $color::inactive_select_fg
>> +
>> + if {$use_ttk} {
>
> I think this check can be safely removed. This is all standard tk
> widgets, and select_bg/fg only changed if use_ttk is true.I only added this check because I initialize the select_fg color to lightblue in non-ttk mode, so the file lists would switch color even though the text fields don't, and I wanted to avoid that. Of course, if I initialize select_fg to lightgray as before, this is not an issue, and the behavior is unchanged in non-ttk mode. I'll change that in v2.
Show 11 quoted lines
>> + bind $i <FocusIn> {
>> + foreach tag [list in_diff in_sel] {
>> + %W tag conf $tag \
>> + -background $color::select_bg \
>> + -foreground $color::select_fg
>> + }
>> + }
>> + bind $i <FocusOut> {
>> + foreach tag [list in_diff in_sel] {
>
> This two `foreach` can be combined into one?I don't see how; any concrete suggestions? But I have other ideas how to simplify the code (by using one function set_selection_colors that takes a has_focus bool and is used for both bindings).
>> + %W tag conf $tag \ > > And this `%W`, probably should be `$i`?
No, $i wouldn't work because we're inside curly braces, so $i wouldn't get expanded. It would be possible to work around this by using "" instead of {}, but why? Using %W seems to be the idiomatic way in bindings, we do this everywhere else too.