diff options
author | Andrei Karas <akaras@inbox.ru> | 2015-05-25 01:58:52 +0300 |
---|---|---|
committer | Andrei Karas <akaras@inbox.ru> | 2015-05-25 01:58:52 +0300 |
commit | e3682e2cdcb59c36792f6f9c39569e0af01088f0 (patch) | |
tree | b4d7a665652e4a8c00f28d557f96b120abc62002 /src/gui/widgets/textpreview.cpp | |
parent | 1b3a9751ae558e45c614f04525d5ff65e3c0fc1e (diff) | |
download | manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.gz manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.bz2 manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.xz manaplus-e3682e2cdcb59c36792f6f9c39569e0af01088f0.zip |
Dont set global color variables before drawing text.
This allow not set actual OpenGL color on each call
because it useless for drawing text.
Diffstat (limited to 'src/gui/widgets/textpreview.cpp')
-rw-r--r-- | src/gui/widgets/textpreview.cpp | 23 |
1 files changed, 18 insertions, 5 deletions
diff --git a/src/gui/widgets/textpreview.cpp b/src/gui/widgets/textpreview.cpp index acb5e3e12..5c829ecd7 100644 --- a/src/gui/widgets/textpreview.cpp +++ b/src/gui/widgets/textpreview.cpp @@ -114,14 +114,27 @@ void TextPreview::draw(Graphics* graphics) graphics->fillRectangle(Rect(mPadding, mPadding, x, y)); } - graphics->setColorAll(Color(mTextColor->r, - mTextColor->g, mTextColor->b, alpha), - Color(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha)); + Color color1(mTextColor->r, mTextColor->g, mTextColor->b, alpha); if (mOutline && mTextColor != mTextColor2) - graphics->setColor2(getThemeColor(Theme::OUTLINE, 255)); + { + const Color &color2 = getThemeColor(Theme::OUTLINE, 255); + mFont->drawString(graphics, + color1, + color2, + mText, + mPadding + 1, mPadding + 1); + } + else + { + Color color2(mTextColor2->r, mTextColor2->g, mTextColor2->b, alpha); + mFont->drawString(graphics, + color1, + color2, + mText, + mPadding + 1, mPadding + 1); + } - mFont->drawString(graphics, mText, mPadding + 1, mPadding + 1); BLOCK_END("TextPreview::draw") } |