From 9c98aee49acabd279f526bb618d14fc0567a1348 Mon Sep 17 00:00:00 2001
From: fvogel <fvogelnew1@free.fr>
Date: Wed, 17 Dec 2014 21:54:54 +0000
Subject: Fixed vertical scrolling with elided lines. MeasureUp was not
 measuring fully correctly.

---
 generic/tkTextDisp.c |  2 ++
 tests/textDisp.test  | 13 +++++++++++++
 2 files changed, 15 insertions(+)

diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index e87b5e8..e318338 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -5328,6 +5328,8 @@ MeasureUp(
 
 	index.linePtr = TkBTreeFindLine(srcPtr->tree, textPtr, lineNum);
 	index.byteIndex = 0;
+        TkTextFindDisplayLineEnd(textPtr, &index, 0, NULL);
+        lineNum = TkBTreeLinesTo(textPtr, index.linePtr);
 	lowestPtr = NULL;
 	do {
 	    dlPtr = LayoutDLine(textPtr, &index);
diff --git a/tests/textDisp.test b/tests/textDisp.test
index b8db32c..ea2100c 100644
--- a/tests/textDisp.test
+++ b/tests/textDisp.test
@@ -2118,6 +2118,19 @@ test textDisp-16.43 {TkTextYviewCmd procedure with indices in elided lines} {
     update
     .t index @0,0
 } {5.0}
+test textDisp-16.44 {TkTextYviewCmd procedure, scroll down, with elided lines} {
+    .t configure -wrap none
+    .t delete 1.0 end
+    foreach x [list 0 1 2 3 4 5 6 7 8 9 0] {
+      .t insert end "$x aaa1\n$x bbb2\n$x ccc3\n$x ddd4\n$x eee5\n$x fff6"
+      .t insert end "$x 1111\n$x 2222\n$x 3333\n$x 4444\n$x 5555\n$x 6666" hidden
+    }
+    .t tag configure hidden -elide true ; # 5 hidden lines
+    update
+    .t see [expr {5 + [winfo height .t] / $fixedHeight} + 1].0
+    update
+    .t index @0,0
+} {2.0}
 
 .t delete 1.0 end
 foreach i {a b c d e f g h i j k l m n o p q r s t u v w x y z} {
-- 
cgit v0.12