* the FontManager is now a looper (but doesn't do anything useful yet).
* moved the system default font functionality into the DesktopSettings class. * ServerFont::SetStyle() is now a public method. * Improved font fallback routines: they will never end up without a font if there is at least one font installed. * fixed some minor bugs in the DecorManager. * Decorator now get a DesktopSettings object passed - dunno if that's a good idea (since we'll have to open the DesktopSettings header), but it works for now (and something like this is probably needed anyway). * a clean ServerFont is now set to the system default font - and not to the (user chosen) desktop default font anymore (since the font manager doesn't know about that one). * Improved font directory scanning in the font manager a bit, it's now using find_directory() instead of hard-coded paths. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@14666 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
@@ -5,9 +5,10 @@
|
||||
* Authors:
|
||||
* DarkWyrm <[email protected]>
|
||||
* Jérôme Duval, [email protected]
|
||||
* Axel Dörfler, [email protected]
|
||||
*/
|
||||
#ifndef SERVERFONT_H_
|
||||
#define SERVERFONT_H_
|
||||
#ifndef SERVER_FONT_H
|
||||
#define SERVER_FONT_H
|
||||
|
||||
|
||||
#include <Font.h>
|
||||
@@ -62,7 +63,8 @@ class ServerFont {
|
||||
const char* GetFamily() const;
|
||||
const char* GetPath() const
|
||||
{ return fStyle->Path(); }
|
||||
|
||||
|
||||
void SetStyle(FontStyle& style);
|
||||
status_t SetFamilyAndStyle(uint16 familyID,
|
||||
uint16 styleID);
|
||||
status_t SetFamilyAndStyle(uint32 fontID);
|
||||
@@ -151,8 +153,6 @@ class ServerFont {
|
||||
|
||||
protected:
|
||||
friend class FontStyle;
|
||||
void _SetStyle(FontStyle* style);
|
||||
|
||||
|
||||
FontStyle* fStyle;
|
||||
edge_info fEdges;
|
||||
@@ -167,5 +167,4 @@ protected:
|
||||
uint32 fEncoding;
|
||||
};
|
||||
|
||||
#endif
|
||||
|
||||
#endif /* SERVER_FONT_H */
|
||||
|
||||
Reference in New Issue
Block a user