]> git.ipfire.org Git - thirdparty/git.git/commitdiff
gitk: Un-hide selection in areas with non-default background color
authorJohannes Sixt <j6t@kdbg.org>
Thu, 9 Apr 2020 17:48:12 +0000 (19:48 +0200)
committerPaul Mackerras <paulus@ozlabs.org>
Mon, 13 Apr 2020 04:36:15 +0000 (14:36 +1000)
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>
gitk

diff --git a/gitk b/gitk
index 16cb5d7add48e32b2211949d1a4ca530ee11eb0f..88c986884f5ac45694a50052727107f88f9e01f0 100755 (executable)
--- 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} {