gitk: Don't change cursor at end of layout if find in progress

If the user is doing a find in files or patches, which changed the
cursor to a watch, don't change it back to a pointer when we reach
the end of laying out the graph.

Signed-off-by: Paul Mackerras <paulus@samba.org>

diff --git a/gitk b/gitk
index ad2fe3b215931412c16ec93e512d56c29deb35fd..34f55bc1ecb4424cd481d5ab316fe6fc7fc56c6e 100755 (executable)
--- a/gitk
+++ b/gitk
@@ -1620,6 +1620,7 @@ proc xcoord {i level ln} {
 proc finishcommits {} {
     global commitidx phase
     global canv mainfont ctext maincursor textcursor
 proc finishcommits {} {
     global commitidx phase
     global canv mainfont ctext maincursor textcursor

+    global findinprogress

 
     if {$commitidx > 0} {
        drawrest
 
     if {$commitidx > 0} {
        drawrest


@@ -1628,8 +1629,10 @@ proc finishcommits {} {
        $canv create text 3 3 -anchor nw -text "No commits selected" \
            -font $mainfont -tags textitems
     }
        $canv create text 3 3 -anchor nw -text "No commits selected" \
            -font $mainfont -tags textitems
     }

-    . config -cursor $maincursor
-    settextcursor $textcursor
+    if {![info exists findinprogress]} {
+       . config -cursor $maincursor
+       settextcursor $textcursor
+    }

     set phase {}
 }
 
     set phase {}
 }
 


@@ -1657,7 +1660,7 @@ proc drawrest {} {
     showstuff $commitidx
 
     set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]
     showstuff $commitidx
 
     set drawmsecs [expr {[clock clicks -milliseconds] - $startmsecs}]

-    #puts "overall $drawmsecs ms for $numcommits commits"
+    puts "overall $drawmsecs ms for $numcommits commits"

 }
 
 proc findmatches {f} {
 }
 
 proc findmatches {f} {