From 546b89b1c20dc25d8013f92c7a2053e940483fec Mon Sep 17 00:00:00 2001
From: Neil Hodgson <nyamatongwe@gmail.com>
Date: Sat, 7 Jun 2014 09:22:37 +1000
Subject: Fix laying out of emoji. Emoji are not in the BMP, taking 2 UTF-16
 code units. Previously the position used was that reported after the first
 code unit (0) instead of that after both code units. This led to the
 character after the emoji sharing space with it.

---
 cocoa/PlatCocoa.mm | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'cocoa')

diff --git a/cocoa/PlatCocoa.mm b/cocoa/PlatCocoa.mm
index 2225631a6..28fe4dd8b 100644
--- a/cocoa/PlatCocoa.mm
+++ b/cocoa/PlatCocoa.mm
@@ -957,7 +957,7 @@ void SurfaceImpl::MeasureWidths(Font &font_, const char *s, int len, XYPOSITION
 		while (ui<fit) {
 			size_t lenChar = utf8LengthFromLead(us[i]);
 			size_t codeUnits = (lenChar < 4) ? 1 : 2;
-			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, ui+1, NULL);
+			CGFloat xPosition = CTLineGetOffsetForStringIndex(mLine, ui+codeUnits, NULL);
 			for (unsigned int bytePos=0; (bytePos<lenChar) && (i<len); bytePos++) {
 				positions[i++] = xPosition;
 			}
-- 
cgit v1.2.3