diff options
| author | jmarshallnz <jmarshallnz@svn> | 2010-07-24 06:13:30 +0000 |
|---|---|---|
| committer | jmarshallnz <jmarshallnz@svn> | 2010-07-24 06:13:30 +0000 |
| commit | f9abc951435cb503caf0da090b2d7cd310577851 (patch) | |
| tree | 27cee73c0f807c950bbddc29ab8028d27c677fa7 /guilib/GUIFontManager.h | |
| parent | 7bff444b2cf246db0501fc5f987fc2e210c71672 (diff) | |
merged: r32114-r32117
changed: Switch RenderOutline to use a separate border font, inflated by freetype rather than re-rendering the same text over and over. Fixes #9713. (cherry picked from commit e3c5d99a34be15fd30c91f56897f3b032acb090d)
added: Ticket #9680 - Better timecode based seeking in videos, thanks to David Byers (cherry picked from commit b4169ad27ae2e9b890c9e1d8286b23fe82daeac3)
changed: Move OSD toggling action handling into GUIWindowFullScreen (cherry picked from commit 812652466a455eec9309eb37642077ce734e0be7)
changed: map enter/select buttons to select in fullscreen video, to aid in entering timecodes. (cherry picked from commit 1222cc5c53b8cd0aede3f403499b8f27ed7e6088)
git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/branches/Dharma@32120 568bbfeb-2a22-0410-94d2-cc84cf5bfa90
Diffstat (limited to 'guilib/GUIFontManager.h')
| -rw-r--r-- | guilib/GUIFontManager.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/guilib/GUIFontManager.h b/guilib/GUIFontManager.h index 170f89f199..e0469a9813 100644 --- a/guilib/GUIFontManager.h +++ b/guilib/GUIFontManager.h @@ -46,6 +46,7 @@ struct OrigFontInfo CStdString fileName; RESOLUTION sourceRes; bool preserveAspect; + bool border; }; /*! @@ -62,7 +63,7 @@ public: void Unload(const CStdString& strFontName); void LoadFonts(const CStdString& strFontSet); - CGUIFont* LoadTTF(const CStdString& strFontName, const CStdString& strFilename, color_t textColor, color_t shadowColor, const int iSize, const int iStyle, float lineSpacing = 1.0f, float aspect = 1.0f, RESOLUTION res = RES_INVALID, bool preserveAspect = false); + CGUIFont* LoadTTF(const CStdString& strFontName, const CStdString& strFilename, color_t textColor, color_t shadowColor, const int iSize, const int iStyle, bool border = false, float lineSpacing = 1.0f, float aspect = 1.0f, RESOLUTION res = RES_INVALID, bool preserveAspect = false); CGUIFont* GetFont(const CStdString& strFontName, bool fallback = true); void Clear(); void FreeFontFile(CGUIFontTTFBase *pFont); |