diff options
Diffstat (limited to 'gui/ThemeEngine.h')
| -rw-r--r-- | gui/ThemeEngine.h | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/gui/ThemeEngine.h b/gui/ThemeEngine.h index 0029886de5..f041f85ab9 100644 --- a/gui/ThemeEngine.h +++ b/gui/ThemeEngine.h @@ -35,7 +35,7 @@ #include "graphics/pixelformat.h" -#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.5" +#define SCUMMVM_THEME_VERSION_STR "SCUMMVM_STX0.8.8" class OSystem; @@ -310,6 +310,8 @@ public: int getCharWidth(byte c, FontStyle font = kFontStyleBold) const; + int getKerningOffset(byte left, byte right, FontStyle font = kFontStyleBold) const; + //@} @@ -411,10 +413,12 @@ public: * Interface for the ThemeParser class: Loads a font to use on the GUI from the given * filename. * - * @param fontName Identifier name for the font. - * @param file Name of the font file. + * @param fextId Identifier name for the font. + * @param file Filename of the non-scalable font version. + * @param scalableFile Filename of the scalable version. (Optional) + * @param pointsize Point size for the scalable font. (Optional) */ - bool addFont(TextData textId, const Common::String &file); + bool addFont(TextData textId, const Common::String &file, const Common::String &scalableFile, const int pointsize); /** * Interface for the ThemeParser class: adds a text color value. @@ -536,10 +540,10 @@ protected: */ void unloadTheme(); - const Graphics::Font *loadFont(const Common::String &filename); - const Graphics::Font *loadFontFromArchive(const Common::String &filename); - const Graphics::Font *loadCachedFontFromArchive(const Common::String &filename); + const Graphics::Font *loadScalableFont(const Common::String &filename, const Common::String &charset, const int pointsize, Common::String &name); + const Graphics::Font *loadFont(const Common::String &filename, Common::String &name); Common::String genCacheFilename(const Common::String &filename) const; + const Graphics::Font *loadFont(const Common::String &filename, const Common::String &scalableFilename, const Common::String &charset, const int pointsize, const bool makeLocalizedFont); /** * Actual Dirty Screen handling function. @@ -658,6 +662,7 @@ protected: Common::String _themeId; Common::String _themeFile; Common::Archive *_themeArchive; + Common::SearchSet _themeFiles; bool _useCursor; int _cursorHotspotX, _cursorHotspotY; |