i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

If the font style isn't found, try to scan for fonts as well. The same is done

Browse Source 
for families. This fixes the bug that when a font family was already loaded, but
some of its styles haven't been loaded yet, the app_server would fail to set
the system fonts to those styles. Fixes bug #4148.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31904 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Michael Lotz
2009-07-29 13:04:08 +00:00
parent 533cba7eff
commit 1aab2b2717
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/servers/app/FontManager.cpp
+8 -2
View File
@@ -1038,8 +1038,14 @@ FontManager::GetStyle(const char* familyName, const char* styleName,
return fontStyle; return fontStyle;
// before we fail, we try the mappings for a match // before we fail, we try the mappings for a match
if (_AddMappedFont(family->Name(), styleName) == B_OK) if (_AddMappedFont(family->Name(), styleName) == B_OK) {
return family->GetStyle(styleName); fontStyle = family->GetStyle(styleName);
if (fontStyle != NULL)
return fontStyle;
}
_ScanFonts();
return family->GetStyle(styleName);
} }
if (styleID != 0xffff) if (styleID != 0xffff)