summaryrefslogtreecommitdiff
path: root/gitk
diff options
context:
space:
mode:
authorPaul Mackerras <paulus@samba.org>2006-03-18 05:02:51 (GMT)
committerPaul Mackerras <paulus@samba.org>2006-03-18 05:02:51 (GMT)
commitf4171a19f0a4091093bca4c1671c77b8caa93533 (patch)
tree35d85ee0f6a63084d30af0626d7d264f49063c95 /gitk
parentf7a3e8d254bf0034edfacd5aaf6e13ce2ed58d19 (diff)
downloadgit-f4171a19f0a4091093bca4c1671c77b8caa93533.zip
git-f4171a19f0a4091093bca4c1671c77b8caa93533.tar.gz
git-f4171a19f0a4091093bca4c1671c77b8caa93533.tar.bz2
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>
Diffstat (limited to 'gitk')
-rwxr-xr-xgitk9
1 files changed, 6 insertions, 3 deletions
diff --git a/gitk b/gitk
index ad2fe3b..34f55bc 100755
--- a/gitk
+++ b/gitk
@@ -1620,6 +1620,7 @@ proc xcoord {i level ln} {
proc finishcommits {} {
global commitidx phase
global canv mainfont ctext maincursor textcursor
+ global findinprogress
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
}
- . config -cursor $maincursor
- settextcursor $textcursor
+ if {![info exists findinprogress]} {
+ . config -cursor $maincursor
+ settextcursor $textcursor
+ }
set phase {}
}
@@ -1657,7 +1660,7 @@ proc drawrest {} {
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} {