Merge branch 'ui-enhancements'

Preparing for 0.6.3 release

1 files changed, 5 insertions, 0 deletions

diff --git a/src/TextInputWidget.h b/src/TextInputWidget.h

index 1fb6d7f2..8f634f6b 100644
--- a/src/TextInputWidget.h
+++ b/src/TextInputWidget.h
@@ -30,6 +30,7 @@
 
 #include "SuggestionsPopup.h"
 #include "dialogs/PreviewUploadOverlay.h"
+#include "emoji/PickButton.h"
 
 namespace dialogs {
 class PreviewUploadOverlay;
@@ -159,6 +160,9 @@ public slots:
         void focusLineEdit() { input_->setFocus(); }
         void addReply(const QString &username, const QString &msg);
 
+private slots:
+        void addSelectedEmoji(const QString &emoji);
+
 signals:
         void sendTextMessage(QString msg);
         void sendEmoteMessage(QString msg);
@@ -189,6 +193,7 @@ private:
 
         FlatButton *sendFileBtn_;
         FlatButton *sendMessageBtn_;
+        emoji::PickButton *emojiBtn_;
 
         QColor borderColor_;
 };