From: Johannes Sixt <j6t@kdbg.org>
Date: Thu, 9 Apr 2020 17:48:12 +0000 (+0200)
Subject: gitk: Un-hide selection in areas with non-default background color
X-Git-Tag: v2.29.0-rc0~15^2^2~3
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=2faa6cdc5e4d1d5fd27512994f002fc2640b1949;p=thirdparty%2Fgit.git

gitk: Un-hide selection in areas with non-default background color

The recently introduced background for the tags that highlight
added and removed text takes precedence over the background color
of the selection. But selected text is more important than the
highlighted text. Make the highlighting tags the lowest priority.

The same argument holds for the file separator and the highlight
of search results. Therefore, make them also low-priority. But
search results are a bit more important; therefore, keep them
above the other tags.

Signed-off-by: Johannes Sixt <j6t@kdbg.org>
Signed-off-by: Paul Mackerras <paulus@ozlabs.org>
---

diff --git a/gitk b/gitk
index 16cb5d7add..88c986884f 100755
--- a/gitk
+++ b/gitk
@@ -2460,6 +2460,12 @@ proc makewindow {} {
     $ctext tag conf currentsearchhit -back $currentsearchhitbgcolor
     $ctext tag conf wwrap -wrap word -lmargin2 1c
     $ctext tag conf bold -font textfontbold
+    # set these to the lowest priority:
+    $ctext tag lower currentsearchhit
+    $ctext tag lower found
+    $ctext tag lower filesep
+    $ctext tag lower dresult
+    $ctext tag lower d0
 
     .pwbottom add .bleft
     if {!$use_ttk} {