Merge branch 'master' into strippedstripped1.1.9.4

Conflicts:
	data/fonts/mplus-1p-bold.ttf
	data/fonts/mplus-1p-regular.ttf
	src/guichan/basiccontainer.cpp
	src/guichan/include/guichan/basiccontainer.hpp
	src/guichan/widgets/window.cpp

1 files changed, 2 insertions, 12 deletions

diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 5bb972adc..5aced193f 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -80,6 +80,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
         mBoxHeight = 1;
         mBoxWidth = 1;
     }
+    setForegroundColor(Theme::getThemeColor(Theme::TEXT));
 }
 
 EmoteShortcutContainer::~EmoteShortcutContainer()
@@ -118,20 +119,9 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
         std::string key = keyboard.getKeyValueString(
             keyboard.KEY_EMOTE_1 + i);
 
-        graphics->setColor(Theme::getThemeColor(Theme::TEXT));
+        graphics->setColor(getForegroundColor());
         g->drawText(key, emoteX + 2, emoteY + 2, gcn::Graphics::LEFT);
 
-/*
-        if (emoteShortcut->getEmote(i)
-            && static_cast<unsigned>(emoteShortcut->getEmote(i)) - 1
-            < mEmoteImg.size()
-            && mEmoteImg[emoteShortcut->getEmote(i) - 1])
-        {
-            mEmoteImg[emoteShortcut->getEmote(i) - 1]->draw(g, emoteX + 2,
-                                                            emoteY + 10);
-        }
-*/
-
         if (i < mEmoteImg.size() && mEmoteImg[i] && mEmoteImg[i]->sprite)
             mEmoteImg[i]->sprite->draw(g, emoteX + 2, emoteY + 10);
     }