From 542572394dfb35b6b78b73837ec13c8e3170385a Mon Sep 17 00:00:00 2001 From: Raph Levien Date: Tue, 21 Jul 2015 05:31:11 +0000 Subject: Revert "Allow clusters to start with zero-width characters" This reverts commit 3e0fc64da064b8c4156daf53242b8eeb47830f64. Bug: 22589743 Bug: 22121742 Change-Id: I7b482ffb8a0ee174ddc804aa890de45bdbd758e3 --- libs/minikin/Measurement.cpp | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'libs') 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 -- cgit v1.2.3