aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJohannes Sixt <j6t@kdbg.org>2020-04-09 19:48:12 +0200
committerPaul Mackerras <paulus@ozlabs.org>2020-04-13 14:36:15 +1000
commit2faa6cdc5e4d1d5fd27512994f002fc2640b1949 (patch)
tree1f639b3d8a947dd4910b90741218621476c4e75e
parentgitk: add diff lines background colors (diff)
downloadgit-2faa6cdc5e4d1d5fd27512994f002fc2640b1949.tar.gz
git-2faa6cdc5e4d1d5fd27512994f002fc2640b1949.zip
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>
-rwxr-xr-xgitk6
1 files changed, 6 insertions, 0 deletions
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} {