From e3682e2cdcb59c36792f6f9c39569e0af01088f0 Mon Sep 17 00:00:00 2001 From: Andrei Karas Date: Mon, 25 May 2015 01:58:52 +0300 Subject: Dont set global color variables before drawing text. This allow not set actual OpenGL color on each call because it useless for drawing text. --- src/gui/widgets/dropdown.cpp | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) (limited to 'src/gui/widgets/dropdown.cpp') 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); } } -- cgit v1.2.3-60-g2f50