Merge branch 'top-panel-search-highlight' of github.com:bnfour/gitk
* 'top-panel-search-highlight' of github.com:bnfour/gitk: gitk: do not hard-code color of search results in commit list Signed-off-by: Johannes Sixt <j6t@kdbg.org>maint
commit
bfb0fa7099
4
gitk
4
gitk
|
|
@ -7108,7 +7108,7 @@ proc findselectline {l} {
|
|||
|
||||
# mark the bits of a headline or author that match a find string
|
||||
proc markmatches {canv l str tag matches font row} {
|
||||
global selectedline
|
||||
global selectedline foundbgcolor
|
||||
|
||||
set bbox [$canv bbox $tag]
|
||||
set x0 [lindex $bbox 0]
|
||||
|
|
@ -7122,7 +7122,7 @@ proc markmatches {canv l str tag matches font row} {
|
|||
set xlen [font measure $font [string range $str 0 [expr {$end}]]]
|
||||
set t [$canv create rect [expr {$x0+$xoff}] $y0 \
|
||||
[expr {$x0+$xlen+2}] $y1 \
|
||||
-outline {} -tags [list match$l matches] -fill yellow]
|
||||
-outline {} -tags [list match$l matches] -fill $foundbgcolor]
|
||||
$canv lower $t
|
||||
if {$row == $selectedline} {
|
||||
$canv raise $t secsel
|
||||
|
|
|
|||
Loading…
Reference in New Issue