hyzboy/ULRE
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

delete line_height in FontSource, append char_height attribute.

Browse Source
This commit is contained in:
hyzboy
2020-07-21 11:48:06 +08:00
parent 94cfcd322c
commit a273605b42
4 changed files with 42 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
inc/hgl/graph/font/FontSource.h
View File

@@ -43,6 +43,7 @@ namespace hgl
virtual FontBitmap *GetCharBitmap(const u32char &)=0; ///<取得字符位图数据
virtual int GetCharAdvWidth(const u32char &)=0; ///<取得字符绘制宽度
virtual int GetCharHeight()const=0; ///<取得字符高度
void RefAcquire(void *); ///<引用请求
void RefRelease(void *); ///<引用释放
@@ -69,9 +70,9 @@ namespace hgl
FontSourceSingle(const Font &f){fnt=f;}
virtual ~FontSourceSingle()=default;
FontBitmap * GetCharBitmap(const u32char &ch) override; ///<取得字符位图数据
virtual int GetCharAdvWidth(const u32char &)=0; ///<取得字符绘制宽度
virtual int GetLineHeight()const=0; ///<取得行高
FontBitmap *GetCharBitmap(const u32char &ch) override; ///<取得字符位图数据
virtual int GetCharAdvWidth(const u32char &)=0; ///<取得字符绘制宽度
virtual int GetCharHeight()const override{return fnt.height;} ///<取得字符高度
};//class FontSourceSingle:public FontSource
/**
@@ -84,6 +85,10 @@ namespace hgl
FontSource *default_source;
Map<UnicodeBlock,FontSourcePointer> source_map;
int max_char_height;
void RefreshMaxCharHeight();
protected:
FontSource *GetFontSource(const u32char &ch);
@@ -102,6 +107,7 @@ namespace hgl
FontBitmap *GetCharBitmap(const u32char &ch) override;
int GetCharAdvWidth(const u32char &) override;
int GetCharHeight()const override; ///<取得字符高度
};//class FontSourceMulti:public FontSource
}//namespace graph
}//namespace hgl