atria-soft/ewol
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[DEBUG] Correct the loading of the font

Browse Source
This commit is contained in:
Edouard DUPIN 2015-09-25 21:12:02 +02:00
parent 0e2fbeffce
commit 23350d196c
2 changed files with 14 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
ewol/resource/DistanceFieldFont.cpp
View File

@ -42,12 +42,16 @@ void ewol::resource::DistanceFieldFont::init(const std::string& _fontName) {
std::vector<std::string> folderList; std::vector<std::string> folderList;
if (true == ewol::getContext().getFontDefault().getUseExternal()) { if (true == ewol::getContext().getFontDefault().getUseExternal()) {
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
folderList.push_back("/system/fonts"); folderList.push_back("ROOT:system/fonts");
#elif defined(__TARGET_OS__Linux) #elif defined(__TARGET_OS__Linux)
folderList.push_back("/usr/share/fonts/truetype"); folderList.push_back("ROOT:usr/share/fonts/truetype");
#endif #endif
} }
folderList.push_back(ewol::getContext().getFontDefault().getFolder()); std::string applicationBaseFont = ewol::getContext().getFontDefault().getFolder();
std::vector<std::string> applicationBaseFontList = etk::FSNodeExplodeMultiplePath(applicationBaseFont);
for (auto &it : applicationBaseFontList) {
folderList.push_back(it);
}
for (size_t folderID = 0; folderID < folderList.size() ; folderID++) { for (size_t folderID = 0; folderID < folderList.size() ; folderID++) {
etk::FSNode myFolder(folderList[folderID]); etk::FSNode myFolder(folderList[folderID]);
// find the real Font name : // find the real Font name :

10
ewol/resource/TexturedFont.cpp
View File

@ -97,12 +97,16 @@ void ewol::resource::TexturedFont::init(const std::string& _fontName) {
std::vector<std::string> folderList; std::vector<std::string> folderList;
if (true == ewol::getContext().getFontDefault().getUseExternal()) { if (true == ewol::getContext().getFontDefault().getUseExternal()) {
#if defined(__TARGET_OS__Android) #if defined(__TARGET_OS__Android)
folderList.push_back("/system/fonts"); folderList.push_back("ROOT:system/fonts");
#elif defined(__TARGET_OS__Linux) #elif defined(__TARGET_OS__Linux)
folderList.push_back("/usr/share/fonts/truetype"); folderList.push_back("ROOT:usr/share/fonts/truetype");
#endif #endif
} }
folderList.push_back(ewol::getContext().getFontDefault().getFolder()); std::string applicationBaseFont = ewol::getContext().getFontDefault().getFolder();
std::vector<std::string> applicationBaseFontList = etk::FSNodeExplodeMultiplePath(applicationBaseFont);
for (auto &it : applicationBaseFontList) {
folderList.push_back(it);
}
for (size_t folderID=0; folderID<folderList.size() ; folderID++) { for (size_t folderID=0; folderID<folderList.size() ; folderID++) {
etk::FSNode myFolder(folderList[folderID]); etk::FSNode myFolder(folderList[folderID]);
// find the real Font name : // find the real Font name :