From 04f47f060f94ec0e2dfc3cccf62cff167e0ecd68 Mon Sep 17 00:00:00 2001
From: Andrei Karas <akaras@inbox.ru>
Date: Sun, 22 Jun 2014 15:55:34 +0300
Subject: Reoder some text and image drawing for better batching.

---
 src/gui/widgets/emoteshortcutcontainer.cpp | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

(limited to 'src/gui/widgets/emoteshortcutcontainer.cpp')

diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 0d802034e..1e438f119 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -96,18 +96,6 @@ void EmoteShortcutContainer::draw(Graphics *graphics)
     Font *const font = getFont();
     drawBackground(graphics);
 
-    graphics->setColorAll(mForegroundColor, mForegroundColor2);
-    for (unsigned i = 0; i < mMaxItems; i++)
-    {
-        const int emoteX = (i % mGridWidth) * mBoxWidth;
-        const int emoteY = (i / mGridWidth) * mBoxHeight;
-
-        // Draw emote keyboard shortcut.
-        const std::string key = inputManager.getKeyValueString(
-            InputAction::EMOTE_1 + i);
-
-        font->drawString(graphics, key, emoteX + 2, emoteY + 2);
-    }
     unsigned sz = static_cast<unsigned>(mEmoteImg.size());
     if (sz > mMaxItems)
         sz = mMaxItems;
@@ -125,6 +113,18 @@ void EmoteShortcutContainer::draw(Graphics *graphics)
             }
         }
     }
+    graphics->setColorAll(mForegroundColor, mForegroundColor2);
+    for (unsigned i = 0; i < mMaxItems; i++)
+    {
+        const int emoteX = (i % mGridWidth) * mBoxWidth;
+        const int emoteY = (i / mGridWidth) * mBoxHeight;
+
+        // Draw emote keyboard shortcut.
+        const std::string key = inputManager.getKeyValueString(
+            InputAction::EMOTE_1 + i);
+
+        font->drawString(graphics, key, emoteX + 2, emoteY + 2);
+    }
 
     BLOCK_END("EmoteShortcutContainer::draw")
 }
-- 
cgit v1.2.3-70-g09d2