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

Merge pull request #633 from ProPuke/fix-ios-legacy-font-loading

Browse Source 
fixed: system fonts did not load on modern iOS with legacy lime
This commit is contained in:
Joshua Granick
2015-11-28 19:23:37 -08:00
parent 5167b875aa 8d6605233a
commit 189f29b5d5
1 changed files with 20 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
legacy/project/src/common/FreeType.cpp
View File

@@ -366,7 +366,7 @@ bool GetFontFile(const std::string& inName,std::string &outFile)
// printf("Looking for font %s...", inName.c_str() ); // printf("Looking for font %s...", inName.c_str() );
#ifdef IPHONEOS #ifdef IPHONEOS
#define FONT_BASE "/System/Library/Fonts/Cache/" #define FONT_BASE "/System/Library/Fonts/"
#else #else
#define FONT_BASE "/Library/Fonts/" #define FONT_BASE "/Library/Fonts/"
#endif #endif
@@ -381,10 +381,27 @@ bool GetFontFile(const std::string& inName,std::string &outFile)
} }
#ifdef IPHONEOS
const char *serifFonts[] = {
"Cache/Georgia.ttf", "Cache/Times.ttf", "Cache/Times New Roman.ttf", //pre 8.2
"CoreAddition/Georgia.ttf", "Core/TimesNewRoman.ttf", //8.2+
0
};
const char *sansFonts[] = {
"Cache/Arial Black.ttf", "Cache/Arial.ttf", "Cache/Helvetica.ttf", //pre 8.2
"CoreAddition/Arial.ttf", "Core/Helvetica.ttf", //8.2+
0
};
const char *fixedFonts[] = {
"Cache/Courier New.ttf", "Cache/Courier.ttf", //pre 8.2
"Core/CourierNew.ttf", "Core/Courier.ttf", //8.2+
0
};
#else
const char *serifFonts[] = { "Georgia.ttf", "Times.ttf", "Times New Roman.ttf", 0 }; const char *serifFonts[] = { "Georgia.ttf", "Times.ttf", "Times New Roman.ttf", 0 };
const char *sansFonts[] = { "Arial Black.ttf", "Arial.ttf", "Helvetica.ttf", 0 }; const char *sansFonts[] = { "Arial Black.ttf", "Arial.ttf", "Helvetica.ttf", 0 };
const char *fixedFonts[] = { "Courier New.ttf", "Courier.ttf", 0 }; const char *fixedFonts[] = { "Courier New.ttf", "Courier.ttf", 0 };
#endif
const char **test = 0; const char **test = 0;
@@ -1081,7 +1098,7 @@ value nme_font_iterate_device_fonts(value inFunc)
#elif defined (BLACKBERRY) #elif defined (BLACKBERRY)
"/usr/fonts/font_repository/"; "/usr/fonts/font_repository/";
#elif defined(IPHONEOS) #elif defined(IPHONEOS)
"/System/Library/Fonts/Cache/"; "/System/Library/Fonts/";
#elif defined(__APPLE__) #elif defined(__APPLE__)
"/Library/Fonts/"; "/Library/Fonts/";
#elif defined(HX_WINDOWS) #elif defined(HX_WINDOWS)