summaryrefslogtreecommitdiff
path: root/src/gui/widgets/emoteshortcutcontainer.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-05-04 16:17:21 +0300
committerAndrei Karas <akaras@inbox.ru>2013-05-04 16:17:21 +0300
commit7dec8e169a09513e9bd7f840fea52491b6d17828 (patch)
treefbc6d4f886fa85c312e361ad243ddcc1e00e6bec /src/gui/widgets/emoteshortcutcontainer.cpp
parentfee1c7eb49c61afdab1ddb64bc2dfa7a22d6cf35 (diff)
downloadmv-7dec8e169a09513e9bd7f840fea52491b6d17828.tar.gz
mv-7dec8e169a09513e9bd7f840fea52491b6d17828.tar.bz2
mv-7dec8e169a09513e9bd7f840fea52491b6d17828.tar.xz
mv-7dec8e169a09513e9bd7f840fea52491b6d17828.zip
add outline color TEXT color.
Diffstat (limited to 'src/gui/widgets/emoteshortcutcontainer.cpp')
-rw-r--r--src/gui/widgets/emoteshortcutcontainer.cpp9
1 files changed, 6 insertions, 3 deletions
diff --git a/src/gui/widgets/emoteshortcutcontainer.cpp b/src/gui/widgets/emoteshortcutcontainer.cpp
index 9366a9e36..9629384a4 100644
--- a/src/gui/widgets/emoteshortcutcontainer.cpp
+++ b/src/gui/widgets/emoteshortcutcontainer.cpp
@@ -48,9 +48,9 @@ static const int MAX_ITEMS = 48;
EmoteShortcutContainer::EmoteShortcutContainer():
ShortcutContainer(),
mEmoteImg(),
+ mEmotePopup(new TextPopup),
mEmoteClicked(false),
- mEmoteMoved(0),
- mEmotePopup(new TextPopup)
+ mEmoteMoved(0)
{
addMouseListener(this);
addWidgetListener(this);
@@ -82,6 +82,7 @@ EmoteShortcutContainer::EmoteShortcutContainer():
mBoxWidth = 1;
}
mForegroundColor = getThemeColor(Theme::TEXT);
+ mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE);
}
EmoteShortcutContainer::~EmoteShortcutContainer()
@@ -99,6 +100,7 @@ void EmoteShortcutContainer::setWidget2(const Widget2 *const widget)
{
Widget2::setWidget2(widget);
mForegroundColor = getThemeColor(Theme::TEXT);
+ mForegroundColor2 = getThemeColor(Theme::TEXT_OUTLINE);
}
void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
@@ -115,7 +117,8 @@ void EmoteShortcutContainer::draw(gcn::Graphics *graphics)
gcn::Font *const font = getFont();
drawBackground(g);
- graphics->setColor(mForegroundColor);
+ g->setColor(mForegroundColor);
+ g->setColor2(mForegroundColor2);
for (unsigned i = 0; i < mMaxItems; i++)
{
const int emoteX = (i % mGridWidth) * mBoxWidth;