Dont set global color variables before drawing text.

This allow not set actual OpenGL color on each call
because it useless for drawing text.

1 files changed, 26 insertions, 10 deletions

diff --git a/src/gui/widgets/itemshortcutcontainer.cpp b/src/gui/widgets/itemshortcutcontainer.cpp
index 775062ce1..cc835903d 100644
--- a/src/gui/widgets/itemshortcutcontainer.cpp
+++ b/src/gui/widgets/itemshortcutcontainer.cpp
@@ -115,8 +115,11 @@ void ItemShortcutContainer::draw(Graphics *graphics)
         // Draw item keyboard shortcut.
         const std::string key = inputManager.getKeyValueString(
             InputAction::SHORTCUT_1 + i);
-        graphics->setColorAll(mForegroundColor, mForegroundColor);
-        font->drawString(graphics, key, itemX + 2, itemY + 2);
+        font->drawString(graphics,
+            mForegroundColor,
+            mForegroundColor,
+            key,
+            itemX + 2, itemY + 2);
 
         const int itemId = selShortcut->getItem(i);
         const unsigned char itemColor = selShortcut->getItemColor(i);
@@ -144,16 +147,22 @@ void ItemShortcutContainer::draw(Graphics *graphics)
                     graphics->drawImage(image, itemX, itemY);
                     if (item->isEquipped() == Equipped_true)
                     {
-                        graphics->setColorAll(mEquipedColor, mEquipedColor2);
+                        font->drawString(graphics,
+                            mEquipedColor,
+                            mEquipedColor2,
+                            caption,
+                            itemX + (mBoxWidth - font->getWidth(caption)) / 2,
+                            itemY + mBoxHeight - 14);
                     }
                     else
                     {
-                        graphics->setColorAll(mUnEquipedColor,
-                            mUnEquipedColor2);
+                        font->drawString(graphics,
+                            mUnEquipedColor,
+                            mUnEquipedColor2,
+                            caption,
+                            itemX + (mBoxWidth - font->getWidth(caption)) / 2,
+                            itemY + mBoxHeight - 14);
                     }
-                    font->drawString(graphics, caption,
-                        itemX + (mBoxWidth - font->getWidth(caption)) / 2,
-                        itemY + mBoxHeight - 14);
                 }
             }
         }
@@ -174,7 +183,10 @@ void ItemShortcutContainer::draw(Graphics *graphics)
                     }
                 }
 
-                font->drawString(graphics, spell->getSymbol(),
+                font->drawString(graphics,
+                    mForegroundColor,
+                    mForegroundColor,
+                    spell->getSymbol(),
                     itemX + 2, itemY + mBoxHeight / 2);
             }
         }
@@ -192,7 +204,11 @@ void ItemShortcutContainer::draw(Graphics *graphics)
                     graphics->drawImage(image, itemX, itemY);
                 }
 
-                font->drawString(graphics, skill->data->shortName, itemX + 2,
+                font->drawString(graphics,
+                    mForegroundColor,
+                    mForegroundColor,
+                    skill->data->shortName,
+                    itemX + 2,
                     itemY + mBoxHeight / 2);
             }
         }