summaryrefslogtreecommitdiff
path: root/src/gui/widgets/extendedlistbox.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/extendedlistbox.cpp
parent1b3a9751ae558e45c614f04525d5ff65e3c0fc1e (diff)
downloadManaVerse-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.gz
ManaVerse-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.bz2
ManaVerse-e3682e2cdcb59c36792f6f9c39569e0af01088f0.tar.xz
ManaVerse-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/extendedlistbox.cpp')
-rw-r--r--src/gui/widgets/extendedlistbox.cpp22
1 files changed, 14 insertions, 8 deletions
diff --git a/src/gui/widgets/extendedlistbox.cpp b/src/gui/widgets/extendedlistbox.cpp
index 41400c1a6..6dabc0584 100644
--- a/src/gui/widgets/extendedlistbox.cpp
+++ b/src/gui/widgets/extendedlistbox.cpp
@@ -152,8 +152,6 @@ void ExtendedListBox::draw(Graphics *graphics)
}
}
- graphics->setColorAll(mForegroundColor, mForegroundColor2);
-
for (size_t f = 0; f < itemsSz; ++f)
{
const ExtendedListBoxItem &item = mListItems[f];
@@ -162,17 +160,20 @@ void ExtendedListBox::draw(Graphics *graphics)
const Image *const image = model->getImageAt(row1);
if (!image || !item.image)
{
- font->drawString(graphics, item.text, mPadding, y1 + textPos);
+ font->drawString(graphics,
+ mForegroundColor, mForegroundColor2,
+ item.text,
+ mPadding, y1 + textPos);
}
else
{
- font->drawString(graphics, item.text,
+ font->drawString(graphics,
+ mForegroundColor, mForegroundColor2,
+ item.text,
image->getWidth() + mImagePadding + mSpacing, y1 + textPos);
}
}
- graphics->setColorAll(mForegroundSelectedColor, mForegroundSelectedColor2);
-
for (size_t f = 0; f < selSz; ++f)
{
const ExtendedListBoxItem &item = mSelectedItems[f];
@@ -181,11 +182,16 @@ void ExtendedListBox::draw(Graphics *graphics)
const Image *const image = model->getImageAt(row1);
if (!image || !item.image)
{
- font->drawString(graphics, item.text, mPadding, y1 + textPos);
+ font->drawString(graphics,
+ mForegroundSelectedColor, mForegroundSelectedColor2,
+ item.text,
+ mPadding, y1 + textPos);
}
else
{
- font->drawString(graphics, item.text,
+ font->drawString(graphics,
+ mForegroundSelectedColor, mForegroundSelectedColor2,
+ item.text,
image->getWidth() + mImagePadding + mSpacing, y1 + textPos);
}
}