summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorfvogel <fvogelnew1@free.fr>2016-12-23 22:05:42 (GMT)
committerfvogel <fvogelnew1@free.fr>2016-12-23 22:05:42 (GMT)
commitf816c46ea5a7eefb2cd880dedfa9e3b344a988f3 (patch)
treedaf44e6bf1d7ddaac339123d595d7faa2cd0e3dd
parentbc3690ab244a2bff5ea3ca032bc3cb6047b8d777 (diff)
downloadtk-f816c46ea5a7eefb2cd880dedfa9e3b344a988f3.zip
tk-f816c46ea5a7eefb2cd880dedfa9e3b344a988f3.tar.gz
tk-f816c46ea5a7eefb2cd880dedfa9e3b344a988f3.tar.bz2
On Windows with TK_LAYOUT_WITH_BASE_CHUNKS and TK_DRAW_IN_CONTEXT being both defined for testing purposes, four tests (textDisp-18.6, 20.2, 20.3 and 20.4) were failing. Fix this.
-rw-r--r--generic/tkTextDisp.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/generic/tkTextDisp.c b/generic/tkTextDisp.c
index 1be26c4..4b7b0db 100644
--- a/generic/tkTextDisp.c
+++ b/generic/tkTextDisp.c
@@ -8793,7 +8793,7 @@ FinalizeBaseChunk(
#if TK_DRAW_IN_CONTEXT
newwidth = 0;
CharChunkMeasureChars(chunkPtr, NULL, 0, 0, -1, 0, -1, 0, &newwidth);
- if (newwidth != chunkPtr->width) {
+ if (newwidth < chunkPtr->width) {
widthAdjust += newwidth - chunkPtr->width;
chunkPtr->width = newwidth;
}