summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2014-12-05 20:33:13 (GMT)
committerfvogel <fvogelnew1@free.fr>2014-12-05 20:33:13 (GMT)
commitdd3a3ee0e1986dacd24474e62f1a63a002362c4e (patch)
treee31b756f58e558dfe0d5272dc256b85b24ade6e8 /generic
parent45fd1aa9f09798ce73c7692243123ab5494095d0 (diff)
downloadtk-dd3a3ee0e1986dacd24474e62f1a63a002362c4e.zip
tk-dd3a3ee0e1986dacd24474e62f1a63a002362c4e.tar.gz
tk-dd3a3ee0e1986dacd24474e62f1a63a002362c4e.tar.bz2
Fixed text count -xpixels with indices in elided lines
Diffstat (limited to 'generic')
-rw-r--r--generic/tkTextDisp.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 3d442af..851ee3e 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -3382,7 +3382,8 @@ TkTextFindDisplayLineEnd(
* of the original index within its display
* line. */
{
- if (!end && indexPtr->byteIndex == 0) {
+ if (!end && indexPtr->byteIndex == 0
+ && !TkTextIsElided(textPtr, indexPtr, NULL)) {
/*
* Nothing to do.
*/
@@ -3461,8 +3462,9 @@ TkTextFindDisplayLineEnd(
* this now.
*/
- *xOffset = DlineXOfIndex(textPtr, dlPtr,
- indexPtr->byteIndex - dlPtr->index.byteIndex);
+ *xOffset = DlineXOfIndex(textPtr, dlPtr,
+ TkTextIndexCount(textPtr, &dlPtr->index, indexPtr,
+ COUNT_INDICES));
}
if (end) {
/*