summaryrefslogtreecommitdiff
path: root/src/gui/chatwindow.cpp
diff options
context:
space:
mode:
authorAndrei Karas <akaras@inbox.ru>2013-08-07 20:25:56 +0300
committerAndrei Karas <akaras@inbox.ru>2013-08-07 20:25:56 +0300
commitbd7052d90ce2c493f8f93d2be46625bb8297ad79 (patch)
tree4898d03f613629dcf56ae2b5a2160501a90f4388 /src/gui/chatwindow.cpp
parentf34f096ee0f3c2e66eec7dc024dd18a74698840f (diff)
downloadmv-bd7052d90ce2c493f8f93d2be46625bb8297ad79.tar.gz
mv-bd7052d90ce2c493f8f93d2be46625bb8297ad79.tar.bz2
mv-bd7052d90ce2c493f8f93d2be46625bb8297ad79.tar.xz
mv-bd7052d90ce2c493f8f93d2be46625bb8297ad79.zip
Add font 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 ed8e6a1d3..b33a14a0e 100644
--- a/src/gui/chatwindow.cpp
+++ b/src/gui/chatwindow.cpp
@@ -511,6 +511,18 @@ void ChatWindow::action(const gcn::ActionEvent &event)
}
}
}
+ else if (eventId == "font")
+ {
+ if (emoteWindow)
+ {
+ const std::string str = emoteWindow->getSelectedFont();
+ if (!str.empty())
+ {
+ addInputText(str, false);
+ emoteWindow->clearFont();
+ }
+ }
+ }
else if (eventId == ACTION_COLOR_PICKER)
{
if (mColorPicker)