diff options
| author | Raph Levien <raph@google.com> | 2015-07-21 16:55:08 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-21 16:55:08 +0000 |
| commit | 5ba60b1c255efee72316f002bc850908b7f0fe4e (patch) | |
| tree | bbd4f2445ef9fce125a67328ee5967740b8d5aee | |
| parent | e9ec9a1d1b9e177659b7cc2cd3a102760fcfec14 (diff) | |
| parent | 542572394dfb35b6b78b73837ec13c8e3170385a (diff) | |
| download | android_frameworks_minikin-5ba60b1c255efee72316f002bc850908b7f0fe4e.tar.gz android_frameworks_minikin-5ba60b1c255efee72316f002bc850908b7f0fe4e.tar.bz2 android_frameworks_minikin-5ba60b1c255efee72316f002bc850908b7f0fe4e.zip | |
Merge "Revert "Allow clusters to start with zero-width characters"" into mnc-dev
| -rw-r--r-- | libs/minikin/Measurement.cpp | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/libs/minikin/Measurement.cpp b/libs/minikin/Measurement.cpp index a7bc64b..0b68ac5 100644 --- a/libs/minikin/Measurement.cpp +++ b/libs/minikin/Measurement.cpp @@ -41,8 +41,7 @@ static float getRunAdvance(Layout& layout, const uint16_t* buf, size_t layoutSta clusterWidth = charAdvance; } } - if (offset < start + count && layout.getCharAdvance(offset - layoutStart) == 0.0f && - !GraphemeBreak::isGraphemeBreak(buf, start, count, offset)) { + if (offset < start + count && layout.getCharAdvance(offset - layoutStart) == 0.0f) { // In the middle of a cluster, distribute width of cluster so that each grapheme cluster // gets an equal share. // TODO: get caret information out of font when that's available |