Style changes

API tweaks


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@10927 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
DarkWyrm
2005-01-21 13:11:46 +00:00
parent 9e6e69ab9d
commit cef8b0ffcf
+37 -41
View File
@@ -35,46 +35,47 @@ class ServerFont
{ {
public: public:
ServerFont(void); ServerFont(void);
ServerFont(FontStyle *fstyle, float fsize=12.0, float frotation=0.0, float fshear=90.0, ServerFont(FontStyle *style, float size=12.0, float frotation=0.0, float fshear=90.0,
uint16 flags=0, uint8 spacing=B_CHAR_SPACING); uint16 flags=0, uint8 spacing=B_CHAR_SPACING);
ServerFont(const ServerFont &font); ServerFont(const ServerFont &font);
~ServerFont(void); ~ServerFont(void);
font_direction Direction(void) const { return fdirection; } font_direction Direction(void) const { return fDirection; }
uint32 Encoding(void) const { return fencoding; } uint32 Encoding(void) const { return fEncoding; }
edge_info Edges(void) const { return fedges; } edge_info Edges(void) const { return fEdges; }
uint32 Flags(void) const { return fflags; } uint32 Flags(void) const { return fFlags; }
uint32 Spacing(void) const { return fspacing; } uint32 Spacing(void) const { return fSpacing; }
float Shear(void) const { return fshear; } float Shear(void) const { return fshear; }
float Rotation(void) const { return frotation; } float Rotation(void) const { return frotation; }
float Size(void) const { return fsize; } float Size(void) const { return fSize; }
uint16 Face(void) const { return fface; } uint16 Face(void) const { return fFace; }
uint32 CountGlyphs(void); uint32 CountGlyphs(void) { return fStyle->GlyphCount(); }
int32 CountTuned(void); int32 CountTuned(void);
font_file_format FileFormat(void); font_file_format FileFormat(void);
void SetDirection(const font_direction &dir) { fdirection=dir; } void SetFamilyAndStyle(const uint32 &fontID);
void SetEdges(const edge_info &info) { fedges=info; } void SetDirection(const font_direction &dir) { fDirection=dir; }
void SetEncoding(uint32 encoding) { fencoding=encoding; } void SetEdges(const edge_info &info) { fEdges=info; }
void SetFlags(const uint32 &value) { fflags=value; } void SetEncoding(uint32 encoding) { fEncoding=encoding; }
void SetSpacing(const uint32 &value) { fspacing=value; } void SetFlags(const uint32 &value) { fFlags=value; }
void SetSpacing(const uint32 &value) { fSpacing=value; }
void SetShear(const float &value) { fshear=value; } void SetShear(const float &value) { fshear=value; }
void SetSize(const float &value) { fsize=value; } void SetSize(const float &value) { fSize=value; }
void SetRotation(const float &value) { frotation=value; } void SetRotation(const float &value) { frotation=value; }
void SetFace(const uint32 &value) { fface=value; } void SetFace(const uint32 &value) { fFace=value; }
bool IsFixedWidth(void) { return fstyle->IsFixedWidth(); } bool IsFixedWidth(void) { return fStyle->IsFixedWidth(); }
bool IsScalable(void) { return fstyle->IsScalable(); } bool IsScalable(void) { return fStyle->IsScalable(); }
bool HasKerning(void) { return fstyle->HasKerning(); } bool HasKerning(void) { return fStyle->HasKerning(); }
bool HasTuned(void) { return fstyle->HasTuned(); } bool HasTuned(void) { return fStyle->HasTuned(); }
int32 TunedCount(void) { return fstyle->TunedCount(); } int32 TunedCount(void) { return fStyle->TunedCount(); }
uint16 GlyphCount(void) { return fstyle->GlyphCount(); } uint16 GlyphCount(void) { return fStyle->GlyphCount(); }
uint16 CharMapCount(void) { return fstyle->CharMapCount(); } uint16 CharMapCount(void) { return fStyle->CharMapCount(); }
const char *GetStyle(void) const; const char *GetStyle(void) const;
const char *GetFamily(void) const; const char *GetFamily(void) const;
const char *GetPath(void) const { return fstyle->GetPath(); } const char *GetPath(void) const { return fStyle->GetPath(); }
uint16 StyleID(void) const { return fstyle->GetID(); } uint16 StyleID(void) const { return fStyle->GetID(); }
uint16 FamilyID(void) const { return fstyle->Family()->GetID(); } uint16 FamilyID(void) const { return fStyle->Family()->GetID(); }
BRect BoundingBox(void); BRect BoundingBox(void);
void Height(font_height *fh); void Height(font_height *fh);
@@ -83,21 +84,16 @@ public:
protected: protected:
friend class FontStyle; friend class FontStyle;
FontStyle *fstyle; FontStyle *fStyle;
font_height fheight; edge_info fEdges;
edge_info fedges; float fSize, frotation, fshear;
float fsize, frotation, fshear; BRect fBounds;
BRect fbounds; uint32 fFlags;
uint32 fflags; uint32 fSpacing;
uint32 fspacing; uint16 fFace;
uint16 fface; font_direction fDirection;
font_direction fdirection; uint32 fEncoding;
uint8 ftruncate;
uint32 fencoding;
}; };
#endif #endif
/*
@log
* added '=' operator
*/