diff options
author | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-01-26 21:00:03 +0000 |
---|---|---|
committer | Bjørn Lindeijer <bjorn@lindeijer.nl> | 2008-12-29 15:36:28 +0100 |
commit | 34d64be77d940218babbcbaaeac8b22405793af2 (patch) | |
tree | 309f765c7c3fa3cfe5744e6ec43cc94c3296174a /src | |
parent | a38a8e56faa33b00c94414bde859e637d096de0d (diff) | |
download | mana-client-34d64be77d940218babbcbaaeac8b22405793af2.tar.gz mana-client-34d64be77d940218babbcbaaeac8b22405793af2.tar.bz2 mana-client-34d64be77d940218babbcbaaeac8b22405793af2.tar.xz mana-client-34d64be77d940218babbcbaaeac8b22405793af2.zip |
Image alpha should also be set to 1, in case it was changed before.
(cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0)
Diffstat (limited to 'src')
-rw-r--r-- | src/gui/truetypefont.cpp | 14 | ||||
-rw-r--r-- | src/gui/truetypefont.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/src/gui/truetypefont.cpp b/src/gui/truetypefont.cpp index 82a22bc2..5576eaab 100644 --- a/src/gui/truetypefont.cpp +++ b/src/gui/truetypefont.cpp @@ -35,7 +35,7 @@ class TextChunk { public: - TextChunk(const std::string &text, gcn::Color color) : + TextChunk(const std::string &text, const gcn::Color &color) : img(NULL), text(text), color(color) { } @@ -130,12 +130,12 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics, } gcn::Color col = g->getColor(); - float alpha = 1.0f; - if (col.a != 255) alpha = col.a / 255.0f; - col.a = 255; - /* alpha value is ignored at sting generation so it makes no sense to - * cache the same text with different alpha values. + const float alpha = col.a / 255.0f; + + /* The alpha value is ignored at string generation so avoid caching the + * same text with different alpha values. */ + col.a = 255; TextChunk chunk(text, col); @@ -163,7 +163,7 @@ void TrueTypeFont::drawString(gcn::Graphics *graphics, cache.front().generate(mFont); } - if (alpha != 1.0f) cache.front().img->setAlpha(alpha); + cache.front().img->setAlpha(alpha); g->drawImage(cache.front().img, x, y); } diff --git a/src/gui/truetypefont.h b/src/gui/truetypefont.h index e0e57cd7..48502f1f 100644 --- a/src/gui/truetypefont.h +++ b/src/gui/truetypefont.h @@ -33,7 +33,7 @@ /** * A wrapper around SDL_ttf for allowing the use of TrueType fonts. * - * <b>NOTE:</b> This class needs SDL_ttf to be initialized. + * <b>NOTE:</b> This class initializes SDL_ttf as necessary. */ class TrueTypeFont : public gcn::Font { |