[Scummvm-cvs-logs] scummvm master -> 0d3e79cf77af364063944b5884c34c9da7c0466d
lordhoto
lordhoto at gmail.com
Sat Jan 7 00:36:41 CET 2012
This automated email contains information about 2 new commits which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .
Summary:
309e9a855d GRAPHICS: Slight formatting fix.
0d3e79cf77 GUI: Simplify font loading a bit more.
Commit: 309e9a855d24c66211522445f1b25b54cfe642eb
https://github.com/scummvm/scummvm/commit/309e9a855d24c66211522445f1b25b54cfe642eb
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-06T15:35:26-08:00
Commit Message:
GRAPHICS: Slight formatting fix.
Changed paths:
graphics/fontman.h
diff --git a/graphics/fontman.h b/graphics/fontman.h
index 09c1a19..77ae508 100644
--- a/graphics/fontman.h
+++ b/graphics/fontman.h
@@ -67,7 +67,7 @@ public:
* @param font the font object
* @return true on success, false on failure
*/
- bool setFont(FontUsage usage, const Font *font);
+ bool setFont(FontUsage usage, const Font *font);
/**
* Removes binding from name to font
Commit: 0d3e79cf77af364063944b5884c34c9da7c0466d
https://github.com/scummvm/scummvm/commit/0d3e79cf77af364063944b5884c34c9da7c0466d
Author: Johannes Schickel (lordhoto at scummvm.org)
Date: 2012-01-06T15:35:26-08:00
Commit Message:
GUI: Simplify font loading a bit more.
Changed paths:
gui/ThemeEngine.cpp
diff --git a/gui/ThemeEngine.cpp b/gui/ThemeEngine.cpp
index 7678efb..ae93154 100644
--- a/gui/ThemeEngine.cpp
+++ b/gui/ThemeEngine.cpp
@@ -570,35 +570,19 @@ bool ThemeEngine::addFont(TextData textId, const Common::String &file) {
_texts[textId]->_fontPtr = _font;
} else {
Common::String localized = FontMan.genLocalizedFontFilename(file);
- // Try built-in fonts
- _texts[textId]->_fontPtr = FontMan.getFontByName(localized);
+ // Try localized fonts
+ _texts[textId]->_fontPtr = loadFont(localized);
if (!_texts[textId]->_fontPtr) {
- // First try to load localized font
- _texts[textId]->_fontPtr = loadFont(localized);
+ // Try standard fonts
+ _texts[textId]->_fontPtr = loadFont(file);
- if (_texts[textId]->_fontPtr)
- FontMan.assignFontToName(localized, _texts[textId]->_fontPtr);
-
- // Fallback to non-localized font and default translation
- else {
- // Try built-in fonts
- _texts[textId]->_fontPtr = FontMan.getFontByName(file);
-
- // Try to load it
- if (!_texts[textId]->_fontPtr) {
- _texts[textId]->_fontPtr = loadFont(file);
-
- if (!_texts[textId]->_fontPtr)
- error("Couldn't load font '%s'", file.c_str());
-
- FontMan.assignFontToName(file, _texts[textId]->_fontPtr);
- }
+ if (!_texts[textId]->_fontPtr)
+ error("Couldn't load font '%s'", file.c_str());
#ifdef USE_TRANSLATION
- TransMan.setLanguage("C");
+ TransMan.setLanguage("C");
#endif
- warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str());
- }
+ warning("Failed to load localized font '%s'. Using non-localized font and default GUI language instead", localized.c_str());
}
}
@@ -1402,7 +1386,11 @@ DrawData ThemeEngine::parseDrawDataId(const Common::String &name) const {
*********************************************************/
const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
- const Graphics::Font *font = 0;
+ // Try already loaded fonts.
+ const Graphics::Font *font = FontMan.getFontByName(filename);
+ if (font)
+ return font;
+
Common::String cacheFilename = genCacheFilename(filename);
Common::ArchiveMemberList members;
@@ -1428,6 +1416,9 @@ const Graphics::Font *ThemeEngine::loadFont(const Common::String &filename) {
break;
}
+ // If the font is successfully loaded store it in the font manager.
+ if (font)
+ FontMan.assignFontToName(filename, font);
return font;
}
More information about the Scummvm-git-logs
mailing list