summaryrefslogtreecommitdiff
path: root/src/gui/chatwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-06 14:02:19 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-06 14:12:59 +0300
commit73e7be1617217396c5f1eead52af87bc7fef2357 (patch)
treeb985dfd5f1173a6c7e1c741c796a4a61de0cefa8 /src/gui/chatwindow.cpp
parent5ffbb0ca66337bd13a21a1875cc5bec5cc9a724d (diff)
downloadmv-73e7be1617217396c5f1eead52af87bc7fef2357.tar.gz
mv-73e7be1617217396c5f1eead52af87bc7fef2357.tar.bz2
mv-73e7be1617217396c5f1eead52af87bc7fef2357.tar.xz
mv-73e7be1617217396c5f1eead52af87bc7fef2357.zip
add colors tab into chat emotes window.
Diffstat (limited to 'src/gui/chatwindow.cpp')
-rw-r--r--src/gui/chatwindow.cpp12
1 files changed, 12 insertions, 0 deletions
diff --git a/src/gui/chatwindow.cpp b/src/gui/chatwindow.cpp
index 2017fc4f6..ed8e6a1d3 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -499,6 +499,18 @@ void ChatWindow::action(const gcn::ActionEvent &event)
}
}
}
+ else if (eventId == "color")
+ {
+ if (emoteWindow)
+ {
+ const std::string str = emoteWindow->getSelectedColor();
+ if (!str.empty())
+ {
+ addInputText(str, false);
+ emoteWindow->clearColor();
+ }
+ }
+ }
else if (eventId == ACTION_COLOR_PICKER)
{
if (mColorPicker)