[[ TextLayout ]] Implement TextLayout functions on Android

livecodeian · livecodeian · commit e783e22506ee · 2019-11-22T14:43:29.000Z
This patch adds an implementation of MCTextLayout on Android, based on harfbuzz
using the FreeType face handle obtained from the system font handle (a Skia
SkTypeface object)
diff --git a/engine/kernel.gyp b/engine/kernel.gyp
@@ -81,6 +81,7 @@
 						[
 							'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',
 							'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',
+							'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',
 						],
 
 						'link_settings':
diff --git a/engine/src/customprinter.cpp b/engine/src/customprinter.cpp
@@ -1073,6 +1073,9 @@ static bool dotextmark_callback(void *p_context, const MCTextLayoutSpan *p_span)
 	extern int32_t MCCustomPrinterComputeFontSize(void *font);
 	t_font_size = MCCustomPrinterComputeFontSize(p_span -> font);
 	t_font_handle = p_span -> font;
+#elif defined(ANDROID)
+	t_font_size = context->font_size;
+	t_font_handle = p_span->font;
 #else
     // Neither servers nor Android have an implementation
 	t_font_size = 0;
@@ -1129,6 +1132,8 @@ void MCCustomMetaContext::dotextmark(MCMark *p_mark)
 	uint2 t_size, t_style;
     MCFontlistGetCurrent() -> getfontreqs(f, t_name, t_size, t_style);
 	t_state . font_size = t_size;
+#elif defined(ANDROID)
+	t_state . font_size = f -> size;
 #endif
 
 	compute_clip(p_mark -> clip, t_state . clip);
diff --git a/engine/src/mblandroidtextlayout.cpp b/engine/src/mblandroidtextlayout.cpp

Original file line number	Diff line number	Diff line change
`@@ -81,6 +81,7 @@`
`81`	`81`	`[`
`82`	`82`	`'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_skia',`
`83`	`83`	`'../prebuilt/thirdparty.gyp:thirdparty_prebuilt_freetype',`
	`84`	`+ '../prebuilt/thirdparty.gyp:thirdparty_prebuilt_harfbuzz',`
`84`	`85`	`],`
`85`	`86`
`86`	`87`	`'link_settings':`