Singularity-Viewer/SingularityViewer
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

First shot at fixing font fallback

Browse Source
This commit is contained in:
Siana Gearz
2012-03-05 18:18:37 +01:00
parent 0a11f09918
commit b67fa864ff
4 changed files with 11 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
indra/llwindow/llwindowsdl.cpp
View File

@@ -2564,7 +2564,7 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
// Use libfontconfig to find us a nice ordered list of fallback fonts
// specific to this system.
std::string final_fallback("/usr/share/fonts/truetype/kochi/kochi-gothic.ttf");
const int max_font_count_cutoff = 40; // fonts are expensive in the current system, don't enumerate an arbitrary number of them
const int max_font_count_cutoff = 100; // fonts are expensive in the current system, don't enumerate an arbitrary number of them
// Our 'ideal' font properties which define the sorting results.
// slant=0 means Roman, index=0 means the first face in a font file
// (the one we actually use), weight=80 means medium weight,
@@ -2654,7 +2654,7 @@ std::vector<std::string> LLWindowSDL::getDynamicFallbackFontList()
}
llinfos << "Using " << rtns.size() << "/" << found_font_count << " system fonts." << llendl;
rtns.push_back(final_fallback);
//rtns.push_back(final_fallback);
return rtns;
}