The font manager now has default fonts for bold/fixed as well - these are now used

in the DesktopSettings as defaults, too (but can be changed there).


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14804 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2005-11-09 19:16:25 +00:00
parent 16f782ccbd
commit 974dd00c85
5 changed files with 74 additions and 55 deletions
+10 -3
View File
@@ -56,7 +56,9 @@ class FontManager : public BLooper {
FontStyle *GetStyle(uint16 familyID, uint16 styleID) const;
FontStyle* FindStyleMatchingFace(uint16 face) const;
const ServerFont* DefaultFont() const;
const ServerFont* DefaultPlainFont() const;
const ServerFont* DefaultBoldFont() const;
const ServerFont* DefaultFixedFont() const;
void AttachUser(uid_t userID);
void DetachUser(uid_t userID);
@@ -66,7 +68,10 @@ class FontManager : public BLooper {
struct font_mapping;
bool _LoadRecentFontMappings();
status_t _SetDefaultFont();
FontStyle* _GetDefaultStyle(const char *familyName, const char *styleName,
const char *fallbackFamily, const char *fallbackStyle,
uint16 fallbackFace);
status_t _SetDefaultFonts();
void _AddSystemPaths();
status_t _AddPath(const char* path);
status_t _AddPath(BEntry& entry, font_directory** _newDirectory = NULL);
@@ -87,7 +92,9 @@ class FontManager : public BLooper {
BObjectList<font_mapping> fMappings;
BObjectList<FontFamily> fFamilies;
HashTable fStyleHashTable;
ServerFont *fDefaultFont;
ServerFont* fDefaultPlainFont;
ServerFont* fDefaultBoldFont;
ServerFont* fDefaultFixedFont;
bool fScanned;
int32 fNextID;
};