Merge core-8-5-branch

2 files changed, 14 insertions, 10 deletions

diff --git a/generic/tkText.c b/generic/tkText.c
index 36bb4d4..5c7f187 100644
--- a/generic/tkText.c
+++ b/generic/tkText.c
@@ -566,14 +566,6 @@ CreateWidget(
 	textPtr->end = NULL;
     }
 
-    /*
-     * Register with the B-tree. In some sense it would be best if we could do
-     * this later (after configuration options), so that any changes to
-     * start,end do not require a total recalculation.
-     */
-
-    TkBTreeAddClient(sharedPtr->tree, textPtr, textPtr->charHeight);
-
     textPtr->state = TK_TEXT_STATE_NORMAL;
     textPtr->relief = TK_RELIEF_FLAT;
     textPtr->cursor = None;
@@ -584,6 +576,14 @@ CreateWidget(
     textPtr->prevHeight = Tk_Height(newWin);
 
     /*
+     * Register with the B-tree. In some sense it would be best if we could do
+     * this later (after configuration options), so that any changes to
+     * start,end do not require a total recalculation.
+     */
+
+    TkBTreeAddClient(sharedPtr->tree, textPtr, textPtr->charHeight);
+
+    /*
      * This will add refCounts to textPtr.
      */
 
@@ -2342,6 +2342,7 @@ TextWorldChanged(
 {
     Tk_FontMetrics fm;
     int border;
+    int oldCharHeight = textPtr->charHeight;
 
     textPtr->charWidth = Tk_TextWidth(textPtr->tkfont, "0", 1);
     if (textPtr->charWidth <= 0) {
@@ -2353,6 +2354,9 @@ TextWorldChanged(
     if (textPtr->charHeight <= 0) {
 	textPtr->charHeight = 1;
     }
+    if (textPtr->charHeight != oldCharHeight) {
+        TkBTreeClientRangeChanged(textPtr, textPtr->charHeight);
+    }
     border = textPtr->borderWidth + textPtr->highlightWidth;
     Tk_GeometryRequest(textPtr->tkwin,
 	    textPtr->width * textPtr->charWidth + 2*textPtr->padX + 2*border,
diff --git a/tests/textDisp.test b/tests/textDisp.test
index a6bbfd7..9c6af70 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,7 @@ 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}}
 
 deleteWindows
 option clear