summaryrefslogtreecommitdiff
path: root/src/gui/widgets/dropdown.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2015-05-25 01:58:52 +0300
committerAndrei Karas <akaras@inbox.ru>2015-05-25 01:58:52 +0300
commite3682e2cdcb59c36792f6f9c39569e0af01088f0 (patch)
treeb4d7a665652e4a8c00f28d557f96b120abc62002 /src/gui/widgets/dropdown.cpp
parent1b3a9751ae558e45c614f04525d5ff65e3c0fc1e (diff)
downloadmanaplus-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/dropdown.cpp')
-rw-r--r--src/gui/widgets/dropdown.cpp18
1 files changed, 13 insertions, 5 deletions
diff --git a/src/gui/widgets/dropdown.cpp b/src/gui/widgets/dropdown.cpp
index a4afdb6d1..81729c58d 100644
--- a/src/gui/widgets/dropdown.cpp
+++ b/src/gui/widgets/dropdown.cpp
@@ -231,7 +231,6 @@ void DropDown::draw(Graphics* graphics)
if (model && mPopup->getSelected() >= 0)
{
Font *const font = getFont();
- graphics->setColorAll(mForegroundColor, mForegroundColor2);
if (mExtended)
{
const int sel = mPopup->getSelected();
@@ -240,7 +239,10 @@ void DropDown::draw(Graphics* graphics)
const Image *const image = model2->getImageAt(sel);
if (!image)
{
- font->drawString(graphics, model->getElementAt(sel),
+ font->drawString(graphics,
+ mForegroundColor,
+ mForegroundColor2,
+ model->getElementAt(sel),
mPadding, mPadding);
}
else
@@ -248,14 +250,20 @@ void DropDown::draw(Graphics* graphics)
graphics->drawImage(image,
mImagePadding,
(mDimension.height - image->getHeight()) / 2 + mPadding);
- font->drawString(graphics, model->getElementAt(sel),
+ font->drawString(graphics,
+ mForegroundColor,
+ mForegroundColor2,
+ model->getElementAt(sel),
image->getWidth() + mImagePadding + mSpacing, mPadding);
}
}
else
{
- font->drawString(graphics, model->getElementAt(
- mPopup->getSelected()), mPadding, mPadding);
+ font->drawString(graphics,
+ mForegroundColor,
+ mForegroundColor2,
+ model->getElementAt(mPopup->getSelected()),
+ mPadding, mPadding);
}
}