summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogelnew1@free.fr <fvogel>2014-12-30 17:52:30 (GMT)
committerfvogelnew1@free.fr <fvogel>2014-12-30 17:52:30 (GMT)
commit39832d1d8fa18632e007325d700536518d296946 (patch)
tree9ebd27acd1e9f262cdde54a68915a32262f395ca
parentef13ead5f60f9dab81928a81d94dcebc0c033562 (diff)
downloadtk-39832d1d8fa18632e007325d700536518d296946.zip
tk-39832d1d8fa18632e007325d700536518d296946.tar.gz
tk-39832d1d8fa18632e007325d700536518d296946.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;
}