kiss-lang/lime
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix font family name

Browse Source
This commit is contained in:
Joshua Granick
2015-08-29 22:00:35 -07:00
parent 2c3a4fdcb6
commit 6e570deddc
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lime/text/Font.hx
View File

@@ -480,7 +480,7 @@ class Font {
#if (cpp || neko || nodejs) #if (cpp || neko || nodejs)
private static var lime_font_get_ascender = System.loadPrime ("lime", "lime_font_get_ascender", "di"); private static var lime_font_get_ascender = System.loadPrime ("lime", "lime_font_get_ascender", "di");
private static var lime_font_get_descender = System.loadPrime ("lime", "lime_font_get_descender", "di"); private static var lime_font_get_descender = System.loadPrime ("lime", "lime_font_get_descender", "di");
private static var lime_font_get_family_name = System.loadPrime ("lime", "lime_font_get_family_name", "ds"); private static var lime_font_get_family_name = System.loadPrime ("lime", "lime_font_get_family_name", "do");
private static var lime_font_get_glyph_index = System.loadPrime ("lime", "lime_font_get_glyph_index", "dsi"); private static var lime_font_get_glyph_index = System.loadPrime ("lime", "lime_font_get_glyph_index", "dsi");
private static var lime_font_get_glyph_indices = System.loadPrime ("lime", "lime_font_get_glyph_indices", "dso"); private static var lime_font_get_glyph_indices = System.loadPrime ("lime", "lime_font_get_glyph_indices", "dso");
private static var lime_font_get_glyph_metrics = System.loadPrime ("lime", "lime_font_get_glyph_metrics", "dio"); private static var lime_font_get_glyph_metrics = System.loadPrime ("lime", "lime_font_get_glyph_metrics", "dio");

4
project/src/ExternalInterface.cpp
View File

@@ -269,11 +269,11 @@ namespace lime {
} }
HxString lime_font_get_family_name (double fontHandle) { value lime_font_get_family_name (double fontHandle) {
#ifdef LIME_FREETYPE #ifdef LIME_FREETYPE
Font *font = (Font*)(intptr_t)fontHandle; Font *font = (Font*)(intptr_t)fontHandle;
return HxString ((const char*)font->GetFamilyName ()); return alloc_wstring (font->GetFamilyName ());
#else #else
return 0; return 0;
#endif #endif