diff options
| author | Marko Kenttala <ext-marko.r.kenttala@nokia.com> | 2012-02-22 14:18:52 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-02-28 02:05:40 +0100 |
| commit | 9eb8fd324e8ab3adfcea4db1e1f2f139ec2ec443 (patch) | |
| tree | cf088e986198dfa1a8ffdb885354ec90df7d945c /src/3rdparty | |
| parent | fa713e349cbc452fe52c2375a6d05f6b9a689fb7 (diff) | |
Fix for Thai characters with a below mark
Some Thai characters with a mark below got drawn under fonts descent
causing them to be clipped in some situations.
Added checking for this and use of lower offset if needed.
Task-Number: ou1cimx1#979179
Change-Id: If9fb643d4dee24342215a637c805d52b78584333
Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/3rdparty')
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp | 5 | ||||
| -rw-r--r-- | src/3rdparty/harfbuzz/src/harfbuzz-shaper.h | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp index af0ee52e9a..48e9064e94 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.cpp @@ -344,6 +344,11 @@ static inline void positionCluster(HB_ShaperItem *item, int gfrom, int glast) } + // Check drawing below fonts descent + if (cmb == HB_Combining_Below || cmb == HB_Combining_BelowRight) + if ((markMetrics.height + offset) > item->font->klass->getFontMetric(item->font, HB_FontDescent)) + offset = markMetrics.y; // Use offset from mark metrics so it won't get drawn below descent + // combining marks of different class don't interact. Reset the rectangle. if (cmb != lastCmb) { //qDebug("resetting rect"); diff --git a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h index 470e27b6f9..b3f5226423 100644 --- a/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h +++ b/src/3rdparty/harfbuzz/src/harfbuzz-shaper.h @@ -231,7 +231,8 @@ typedef struct { } HB_GlyphMetrics; typedef enum { - HB_FontAscent + HB_FontAscent, + HB_FontDescent } HB_FontMetric; typedef struct { |