Revert "Remove built-in emoji picker"

This reverts commit 4b807229aa.
This commit is contained in:
redsky17 2019-01-26 18:17:08 +00:00
parent faff23ed38
commit df5d24c87f
36 changed files with 809 additions and 3 deletions

View file

@ -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_;
};