diff mbox series

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

Message ID dc614e0d-fe7b-2aed-545b-e4322e35ab12@kdbg.org (mailing list archive)
State Accepted
Commit 2faa6cdc5e4d1d5fd27512994f002fc2640b1949
Headers show
Series [v2] gitk: Un-hide selection in areas with non-default background color | expand

Commit Message

Johannes Sixt April 9, 2020, 5:48 p.m. UTC 
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>
---
Here is an update for my earlier patch as I found that the file
separator also overrides the selection. This fixes it.

1:  7c4c862 ! 1:  3a0e64c gitk: Un-hide selection in added and removed text and search results
    @@ Metadata
     Author: Johannes Sixt <j6t@kdbg.org>
     
      ## Commit message ##
    -    gitk: Un-hide selection in added and removed text and search results
    +    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 highlight of search results. But
    -    search results are a bit more important. Therefore, make them
    -    also low-priority, but just above the added-and-removed tags.
    +    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>
     
    @@ gitk: proc makewindow {} {
     +    # 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
      
 gitk | 6 ++++++
 1 file changed, 6 insertions(+)
diff mbox series

Patch

diff --git a/gitk b/gitk
index 4129c0b..9ac6e5b 100755
--- a/gitk
+++ b/gitk
@@ -2468,6 +2468,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} {