summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2014-12-30 17:52:30 (GMT)
committerfvogel <fvogelnew1@free.fr>2014-12-30 17:52:30 (GMT)
commita1cbc94e3bc9c2bf506d465c1444787701ed5970 (patch)
tree44348e0a31f2b007ead251764a792c5108f69490
parent058f23a24104bd1f6dc55ae34e35dd61004f0735 (diff)
downloadtk-a1cbc94e3bc9c2bf506d465c1444787701ed5970.zip
tk-a1cbc94e3bc9c2bf506d465c1444787701ed5970.tar.gz
tk-a1cbc94e3bc9c2bf506d465c1444787701ed5970.tar.bz2
Reverted [53f96d9a97] since this commit was not correct.
-rw-r--r--generic/tkTextDisp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index c21b600..1383c2a 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -6299,11 +6299,13 @@ GetYPixelCount(
/*
* For the common case where this dlPtr is also the start of the logical
- * line, we can return right away.
+ * line, we can return right away. Note the implicit assumption here that
+ * the start of a logical line is always the start of a display line (if
+ * the 'elide won't elide first newline' bug is fixed, this will no longer
+ * necessarily be true).
*/
- if ((dlPtr->index.byteIndex == 0)
- && !TkTextIsElided(textPtr, &dlPtr->index, NULL)) {
+ if (dlPtr->index.byteIndex == 0) {
return count;
}