diff options
| author | fvogel <fvogelnew1@free.fr> | 2017-09-24 14:57:05 (GMT) |
|---|---|---|
| committer | fvogel <fvogelnew1@free.fr> | 2017-09-24 14:57:05 (GMT) |
| commit | 77ed324954725331597e86d2f066e38f08b9093c (patch) | |
| tree | 4419180890358f5b8245120b08e4222ccb19b112 /generic | |
| parent | 8929e642afed819ec440118bd49de303443ad33b (diff) | |
| parent | 277c3925430a1414c93b53c38f7f37db0326bc02 (diff) | |
| download | tk-77ed324954725331597e86d2f066e38f08b9093c.zip tk-77ed324954725331597e86d2f066e38f08b9093c.tar.gz tk-77ed324954725331597e86d2f066e38f08b9093c.tar.bz2 | |
Fix [514ff64dd0]: canvas rotated text overlap detection not working.
Diffstat (limited to 'generic')
| -rw-r--r-- | generic/tkFont.c | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/generic/tkFont.c b/generic/tkFont.c index 4183686..86fdd87 100644 --- a/generic/tkFont.c +++ b/generic/tkFont.c @@ -3151,14 +3151,13 @@ TkIntersectAngledTextLayout( cy[0] = cy[1] = chunkPtr->y - fontPtr->fm.ascent; cx[1] = cx[2] = chunkPtr->x + chunkPtr->displayWidth; cy[2] = cy[3] = chunkPtr->y + fontPtr->fm.descent; - if ( !PointInQuadrilateral(cx, cy, rx[0], ry[0]) || - !PointInQuadrilateral(cx, cy, rx[1], ry[1]) || - !PointInQuadrilateral(cx, cy, rx[2], ry[2]) || - !PointInQuadrilateral(cx, cy, rx[3], ry[3])) { - goto notReverseInside; - } + if ( PointInQuadrilateral(cx, cy, rx[0], ry[0]) && + PointInQuadrilateral(cx, cy, rx[1], ry[1]) && + PointInQuadrilateral(cx, cy, rx[2], ry[2]) && + PointInQuadrilateral(cx, cy, rx[3], ry[3])) { + return 0; + } } - return 0; /* * If we're overlapping now, we must be partially in and out of at least @@ -3166,7 +3165,6 @@ TkIntersectAngledTextLayout( * rectangle that is touching or crossing a line segment of a chunk. */ - notReverseInside: chunkPtr = layoutPtr->chunks; for (i=0 ; i<layoutPtr->numChunks ; i++,chunkPtr++) { |