diff options
| author | Raph Levien <raph@google.com> | 2015-07-21 05:31:11 +0000 |
|---|---|---|
| committer | Roozbeh Pournader <roozbeh@google.com> | 2015-07-21 16:08:08 +0000 |
| commit | 542572394dfb35b6b78b73837ec13c8e3170385a (patch) | |
| tree | 78fc43e7c9c04932a0996490a8e6d2ddb0ab40f2 | |
| parent | 3e0fc64da064b8c4156daf53242b8eeb47830f64 (diff) | |
| download | android_frameworks_minikin-542572394dfb35b6b78b73837ec13c8e3170385a.tar.gz android_frameworks_minikin-542572394dfb35b6b78b73837ec13c8e3170385a.tar.bz2 android_frameworks_minikin-542572394dfb35b6b78b73837ec13c8e3170385a.zip | |
Revert "Allow clusters to start with zero-width characters"
This reverts commit 3e0fc64da064b8c4156daf53242b8eeb47830f64.
Bug: 22589743
Bug: 22121742
Change-Id: I7b482ffb8a0ee174ddc804aa890de45bdbd758e3
| -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 |