summaryrefslogtreecommitdiffstats
path: root/generic
diff options
context:
space:
mode:
authorfvogelnew1@free.fr <fvogel>2016-12-23 22:05:42 (GMT)
committerfvogelnew1@free.fr <fvogel>2016-12-23 22:05:42 (GMT)
commitd17c9a982c771a469587e6c77c362b2eafc9d6ce (patch)
treedaf44e6bf1d7ddaac339123d595d7faa2cd0e3dd /generic
parent2ce62b2dc9dd8063bdc253ec1b861cad375beab2 (diff)
downloadtk-d17c9a982c771a469587e6c77c362b2eafc9d6ce.zip
tk-d17c9a982c771a469587e6c77c362b2eafc9d6ce.tar.gz
tk-d17c9a982c771a469587e6c77c362b2eafc9d6ce.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.
Diffstat (limited to 'generic')
-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;
}