merge 8.5

1 files changed, 18 insertions, 2 deletions

diff --git a/tests/textDisp.test b/tests/textDisp.test
index a6bbfd7..5508d7c 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -4104,7 +4104,7 @@ test textDisp-33.2 {one line longer than fits in the widget} {
     .tt debug 1
     set tk_textHeightCalc ""
     .tt insert 1.0 [string repeat "more wrap + " 1]
-    after 100 ; update
+    after 100 ; update idletasks
     # Nothing should have been recalculated.
     set tk_textHeightCalc
 } {}
@@ -4184,7 +4184,23 @@ test textDisp-34.1 {Text widgets multi-scrolling problem: Bug 2677890} -setup {
     return $result
 } -cleanup {
     destroy .t1 .sy
-} -result {{0.0 1.0} {0.0 1.0} {0.0 1.0} {0.0 0.24}}
+} -result {{0.0 0.24} {0.0 0.24} {0.0 0.24} {0.0 0.24}}
+
+test textDisp-35.1 {Init value of charHeight - Dancing scrollbar bug 1499165} -setup {
+    pack [text .t1] -fill both -expand y -side left
+    .t insert end "[string repeat a\nb\nc\n 500000]THE END\n"
+    set res {}
+} -body {
+    .t see 10000.0
+    after 300 {set fr1 [.t yview] ; set done 1}
+    vwait done
+    after 300 {set fr2 [.t yview] ; set done 1}
+    vwait done
+    lappend res [expr {[lindex $fr1 0] == [lindex $fr2 0]}]
+    lappend res [expr {[lindex $fr1 1] == [lindex $fr2 1]}]
+} -cleanup {
+    destroy .t1
+} -result {1 1}
 
 deleteWindows
 option clear