diff options
| author | fvogel <fvogelnew1@free.fr> | 2020-07-12 09:25:49 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2020-07-12 09:25:49 (GMT) |
| commit | 55208e8f833e1be79f085fa7cd1519b97fa9cb23 (patch) | |
| tree | 89609c446039a9551c8195534d14906607ed4508 /generic/tkFont.c | |
| parent | 641eafecd32b65ad9d8adfe6803213421a21bef8 (diff) | |
| download | tk-55208e8f833e1be79f085fa7cd1519b97fa9cb23.zip tk-55208e8f833e1be79f085fa7cd1519b97fa9cb23.tar.gz tk-55208e8f833e1be79f085fa7cd1519b97fa9cb23.tar.bz2 | |
Fix regression introduced by [f7f8ba2e3e]. Patch by Christopher Chavez.
Diffstat (limited to 'generic/tkFont.c')
| -rw-r--r-- | generic/tkFont.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 3a06719..ee72d83 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -2339,8 +2339,9 @@ Tk_DrawTextLayout( lastByte = Tcl_UtfAtIndex(chunkPtr->start, numDisplayChars); #if TK_DRAW_IN_CONTEXT TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont, - chunkPtr->start, chunkPtr->numBytes, firstChar, - numDisplayChars - firstChar, x+chunkPtr->x, y+chunkPtr->y); + chunkPtr->start, chunkPtr->numBytes, + firstByte - chunkPtr->start, lastByte - firstByte, + x+chunkPtr->x, y+chunkPtr->y); #else /* !TK_DRAW_IN_CONTEXT */ Tk_DrawChars(display, drawable, gc, layoutPtr->tkfont, firstByte, lastByte - firstByte, x+chunkPtr->x+drawX, y+chunkPtr->y); @@ -2412,12 +2413,12 @@ TkDrawAngledTextLayout( if (angle == 0.0) { TkpDrawCharsInContext(display, drawable, gc, layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes, - firstChar, numDisplayChars - firstChar, + firstByte - chunkPtr->start, lastByte - firstByte, (int)(x + dx), (int)(y + dy)); } else { TkpDrawAngledCharsInContext(display, drawable, gc, layoutPtr->tkfont, chunkPtr->start, chunkPtr->numBytes, - firstChar, numDisplayChars - firstChar, + firstByte - chunkPtr->start, lastByte - firstByte, x+dx, y+dy, angle); } #else /* !TK_DRAW_IN_CONTEXT */ |