summary refs log tree commit diff
path: root/src/TextInputWidget.h
diff options
context:
space:
mode:
authorredsky17 <joedonofry@gmail.com>2019-01-26 18:17:08 +0000
committerredsky17 <joedonofry@gmail.com>2019-01-26 18:17:08 +0000
commitdf5d24c87f46f42b8bc73710bcdcb1a3f5f27b49 (patch)
tree1a82673a6e345bfa651def94687fc9f8539795c6 /src/TextInputWidget.h
parentFix lint issues in last commit (diff)
downloadnheko-df5d24c87f46f42b8bc73710bcdcb1a3f5f27b49.tar.xz
Revert "Remove built-in emoji picker"
This reverts commit 4b807229aa20d6f4891e35f08d489da427d3d0b6.
Diffstat (limited to 'src/TextInputWidget.h')
-rw-r--r--src/TextInputWidget.h5
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_; };