diff options
| author | fvogel <fvogelnew1@free.fr> | 2018-11-19 21:00:38 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2018-11-19 21:00:38 (GMT) |
| commit | d9b0462c75a26e0d69fe1775026aa1eb4c755cd1 (patch) | |
| tree | 34dc11ee85244eba8227a7cbe46b777e5e389ead | |
| parent | 31bf9a3245670aecdfc3dae4b73dff104eca0f93 (diff) | |
| parent | e26edd69395a12e91b698645ccf761cbcf4f572f (diff) | |
| download | tk-d9b0462c75a26e0d69fe1775026aa1eb4c755cd1.zip tk-d9b0462c75a26e0d69fe1775026aa1eb4c755cd1.tar.gz tk-d9b0462c75a26e0d69fe1775026aa1eb4c755cd1.tar.bz2 | |
merge core-8-6-branch
| -rw-r--r-- | generic/tkTextDisp.c | 3 | ||||
| -rw-r--r-- | macosx/tkMacOSXWindowEvent.c | 6 | ||||
| -rw-r--r-- | tests/text.test | 10 |
3 files changed, 11 insertions, 8 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c index 84be232..348b8c4 100644 --- a/generic/tkTextDisp.c +++ b/generic/tkTextDisp.c @@ -6297,7 +6297,8 @@ TkTextPendingsync( TextDInfo *dInfoPtr = textPtr->dInfoPtr; return ( - ((dInfoPtr->metricEpoch == -1) && + (!(dInfoPtr->flags & REDRAW_PENDING) && + (dInfoPtr->metricEpoch == -1) && (dInfoPtr->lastMetricUpdateLine == dInfoPtr->currentMetricUpdateLine)) ? 0 : 1); } diff --git a/macosx/tkMacOSXWindowEvent.c b/macosx/tkMacOSXWindowEvent.c index a87a4ab..bb426a6 100644 --- a/macosx/tkMacOSXWindowEvent.c +++ b/macosx/tkMacOSXWindowEvent.c @@ -837,8 +837,10 @@ ConfigureRestrictProc( * them on OSX > 10.13, where they should never happen. */ - if ([NSApp isDrawing] && [NSApp macMinorVersion] > 13) { - TKLog(@"WARNING: a recursive call to drawRect was aborted."); + if ([NSApp isDrawing]) { + if ([NSApp macMinorVersion] > 13) { + TKLog(@"WARNING: a recursive call to drawRect was aborted."); + } return; } diff --git a/tests/text.test b/tests/text.test index ee46f02..203effd 100644 --- a/tests/text.test +++ b/tests/text.test @@ -3028,17 +3028,17 @@ test text-11a.22 {TextWidgetCmd procedure, "sync" option with -command} -setup { } .top.yt insert 1.0 $content # first case: line metrics calculation still running when launching 'sync -command' - lappend res [.top.yt pendingsync] + lappend res [.top.yt pendingsync] ; # {1} .top.yt sync -command [list set ::x 1] - lappend res $::x + lappend res $::x ; # {1 0} # now finish line metrics calculations while {[.top.yt pendingsync]} {update} - lappend res [.top.yt pendingsync] $::x + lappend res [.top.yt pendingsync] $::x ; # {1 0 0 1} # second case: line metrics calculation completed when launching 'sync -command' .top.yt sync -command [list set ::x 2] - lappend res $::x + lappend res $::x ; # {1 0 0 1 1} vwait ::x - lappend res $::x + lappend res $::x ; # {1 0 0 1 1 2} } -cleanup { destroy .top.yt .top } -result {1 0 0 1 1 2} |