From 34d64be77d940218babbcbaaeac8b22405793af2 Mon Sep 17 00:00:00 2001 From: Bjørn Lindeijer Date: Sat, 26 Jan 2008 21:00:03 +0000 Subject: Image alpha should also be set to 1, in case it was changed before. (cherry picked from mainline commit 0962fc8b567279a6e97e13e4b3f2f9f2ffe304c0) --- src/gui/truetypefont.cpp | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'src/gui/truetypefont.cpp') 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); } -- cgit v1.2.3-60-g2f50