Remove built-in emoji picker

CHANGELOG.md

@@ -10,9 +10,12 @@
 
 ### Improvements
 - Don't enable tray by default.
-- Remove room re-ordering option.
 - Hard-coded pixel values were removed. The sizes are derived from the font.
 
+### Removed
+- Remove room re-ordering option.
+- Built-in emoji picker & emoji font.
+
 ## [0.6.1] - 2018-09-26
 
 ### Improvements

CMakeLists.txt

@@ -176,10 +176,6 @@ set(SRC_FILES
     src/dialogs/RoomSettings.cpp
 
     # Emoji
-    src/emoji/Category.cpp
-    src/emoji/ItemDelegate.cpp
-    src/emoji/Panel.cpp
-    src/emoji/PickButton.cpp
     src/emoji/Provider.cpp
 
     # Timeline
@@ -302,12 +298,6 @@ qt5_wrap_cpp(MOC_HEADERS
     src/dialogs/ReCaptcha.h
     src/dialogs/RoomSettings.h
 
-    # Emoji
-    src/emoji/Category.h
-    src/emoji/ItemDelegate.h
-    src/emoji/Panel.h
-    src/emoji/PickButton.h
-
     # Timeline
     src/timeline/TimelineItem.h
     src/timeline/TimelineView.h

README.md

@@ -266,7 +266,6 @@ Here is a screen shot to get a feel for the UI, but things will probably change.
 
 ### Third party
 
-- [Emoji One](http://emojione.com)
 - [Font Awesome](http://fontawesome.io/)
 - [Open Sans](https://fonts.google.com/specimen/Open+Sans)
 

resources/res.qrc

@@ -63,22 +63,6 @@
         <file>icons/ui/edit.png</file>
         <file>icons/ui/edit@2x.png</file>
 
-        <file>icons/emoji-categories/people.png</file>
-        <file>icons/emoji-categories/people@2x.png</file>
-        <file>icons/emoji-categories/nature.png</file>
-        <file>icons/emoji-categories/nature@2x.png</file>
-        <file>icons/emoji-categories/foods.png</file>
-        <file>icons/emoji-categories/foods@2x.png</file>
-        <file>icons/emoji-categories/activity.png</file>
-        <file>icons/emoji-categories/activity@2x.png</file>
-        <file>icons/emoji-categories/travel.png</file>
-        <file>icons/emoji-categories/travel@2x.png</file>
-        <file>icons/emoji-categories/objects.png</file>
-        <file>icons/emoji-categories/objects@2x.png</file>
-        <file>icons/emoji-categories/symbols.png</file>
-        <file>icons/emoji-categories/symbols@2x.png</file>
-        <file>icons/emoji-categories/flags.png</file>
-        <file>icons/emoji-categories/flags@2x.png</file>
     </qresource>
     <qresource prefix="/logos">
         <file>nheko.png</file>
@@ -104,7 +88,6 @@
         <file>fonts/OpenSans/OpenSans-Italic.ttf</file>
         <file>fonts/OpenSans/OpenSans-Bold.ttf</file>
         <file>fonts/OpenSans/OpenSans-Semibold.ttf</file>
-        <file>fonts/EmojiOne/emojione-android.ttf</file>
     </qresource>
     <qresource prefix="/styles">
         <file>styles/system.qss</file>

resources/styles/nheko-dark.qss

@@ -184,18 +184,6 @@ RegisterPage {
     color: #caccd1;
 }
 
-emoji--Panel,
-emoji--Panel > * {
-    background-color: #202228;
-    color: #caccd1;
-}
-
-emoji--Category,
-emoji--Category > * {
-    background-color: #2d3139;
-    color: #caccd1;
-}
-
 FloatingButton {
     qproperty-backgroundColor: #2d3139;
     qproperty-foregroundColor: white;

resources/styles/nheko.qss

@@ -182,18 +182,6 @@ RegisterPage {
     color: #333;
 }
 
-emoji--Panel,
-emoji--Panel > * {
-    background-color: #eee;
-    color: #333;
-}
-
-emoji--Category,
-emoji--Category > * {
-    background-color: white;
-    color: #ccc;
-}
-
 FloatingButton {
     qproperty-backgroundColor: #efefef;
     qproperty-foregroundColor: black;

src/TextInputWidget.cpp

@@ -513,22 +513,8 @@ TextInputWidget::TextInputWidget(QWidget *parent)
         sendMessageBtn_->setIcon(send_message_icon);
         sendMessageBtn_->setIconSize(QSize(ButtonHeight, ButtonHeight));
 
-        emojiBtn_ = new emoji::PickButton(this);
-        emojiBtn_->setToolTip(tr("Emoji"));
-
-#if defined(Q_OS_MAC)
-        // macOS has a native emoji picker.
-        emojiBtn_->hide();
-#endif
-
-        QIcon emoji_icon;
-        emoji_icon.addFile(":/icons/icons/ui/smile.png");
-        emojiBtn_->setIcon(emoji_icon);
-        emojiBtn_->setIconSize(QSize(ButtonHeight, ButtonHeight));
-
         topLayout_->addWidget(sendFileBtn_);
         topLayout_->addWidget(input_);
-        topLayout_->addWidget(emojiBtn_);
         topLayout_->addWidget(sendMessageBtn_);
 
         setLayout(topLayout_);
@@ -541,11 +527,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
         connect(input_, &FilteredTextEdit::audio, this, &TextInputWidget::uploadAudio);
         connect(input_, &FilteredTextEdit::video, this, &TextInputWidget::uploadVideo);
         connect(input_, &FilteredTextEdit::file, this, &TextInputWidget::uploadFile);
-        connect(emojiBtn_,
-                SIGNAL(emojiSelected(const QString &)),
-                this,
-                SLOT(addSelectedEmoji(const QString &)));
-
         connect(input_, &FilteredTextEdit::startedTyping, this, &TextInputWidget::startedTyping);
 
         connect(input_, &FilteredTextEdit::stoppedTyping, this, &TextInputWidget::stoppedTyping);
@@ -554,22 +535,6 @@ TextInputWidget::TextInputWidget(QWidget *parent)
           input_, &FilteredTextEdit::startedUpload, this, &TextInputWidget::showUploadSpinner);
 }
 
-void
-TextInputWidget::addSelectedEmoji(const QString &emoji)
-{
-        QTextCursor cursor = input_->textCursor();
-
-        QTextCharFormat charfmt;
-        input_->setCurrentCharFormat(charfmt);
-
-        input_->insertPlainText(emoji);
-        cursor.movePosition(QTextCursor::End);
-
-        input_->setCurrentCharFormat(charfmt);
-
-        input_->show();
-}
-
 void
 TextInputWidget::command(QString command, QString args)
 {

src/TextInputWidget.h

@@ -30,7 +30,6 @@
 
 #include "SuggestionsPopup.h"
 #include "dialogs/PreviewUploadOverlay.h"
-#include "emoji/PickButton.h"
 
 namespace dialogs {
 class PreviewUploadOverlay;
@@ -160,9 +159,6 @@ 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);
@@ -193,7 +189,6 @@ private:
 
         FlatButton *sendFileBtn_;
         FlatButton *sendMessageBtn_;
-        emoji::PickButton *emojiBtn_;
 
         QColor borderColor_;
 };

src/emoji/Category.cpp

@@ -1,90 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QPainter>
-#include <QScrollBar>
-#include <QStyleOption>
-
-#include "Config.h"
-
-#include "emoji/Category.h"
-
-using namespace emoji;
-
-Category::Category(QString category, std::vector<Emoji> emoji, QWidget *parent)
-  : QWidget(parent)
-{
-        mainLayout_ = new QVBoxLayout(this);
-        mainLayout_->setMargin(0);
-        mainLayout_->setSpacing(0);
-
-        emojiListView_ = new QListView();
-        itemModel_     = new QStandardItemModel(this);
-
-        delegate_ = new ItemDelegate(this);
-        data_     = new Emoji;
-
-        emojiListView_->setItemDelegate(delegate_);
-        emojiListView_->setModel(itemModel_);
-        emojiListView_->setViewMode(QListView::IconMode);
-        emojiListView_->setFlow(QListView::LeftToRight);
-        emojiListView_->setResizeMode(QListView::Adjust);
-        emojiListView_->verticalScrollBar()->setEnabled(false);
-        emojiListView_->horizontalScrollBar()->setEnabled(false);
-
-        const int cols = 7;
-        const int rows = emoji.size() / 7;
-
-        // TODO: Be precise here. Take the parent into consideration.
-        emojiListView_->setFixedSize(cols * 50 + 20, rows * 50 + 20);
-        emojiListView_->setGridSize(QSize(50, 50));
-        emojiListView_->setDragEnabled(false);
-        emojiListView_->setEditTriggers(QAbstractItemView::NoEditTriggers);
-
-        for (const auto &e : emoji) {
-                data_->unicode = e.unicode;
-
-                auto item = new QStandardItem;
-                item->setSizeHint(QSize(24, 24));
-
-                QVariant unicode(data_->unicode);
-                item->setData(unicode.toString(), Qt::UserRole);
-
-                itemModel_->appendRow(item);
-        }
-
-        QFont font;
-        font.setWeight(QFont::Medium);
-
-        category_ = new QLabel(category, this);
-        category_->setFont(font);
-        category_->setStyleSheet("margin: 20px 0 20px 8px;");
-
-        mainLayout_->addWidget(category_);
-        mainLayout_->addWidget(emojiListView_);
-
-        connect(emojiListView_, &QListView::clicked, this, &Category::clickIndex);
-}
-
-void
-Category::paintEvent(QPaintEvent *)
-{
-        QStyleOption opt;
-        opt.init(this);
-        QPainter p(this);
-        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-}

src/emoji/Category.h

@@ -1,59 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QLabel>
-#include <QLayout>
-#include <QListView>
-#include <QStandardItemModel>
-
-#include "ItemDelegate.h"
-
-namespace emoji {
-
-class Category : public QWidget
-{
-        Q_OBJECT
-
-public:
-        Category(QString category, std::vector<Emoji> emoji, QWidget *parent = nullptr);
-
-signals:
-        void emojiSelected(const QString &emoji);
-
-protected:
-        void paintEvent(QPaintEvent *event) override;
-
-private slots:
-        void clickIndex(const QModelIndex &index)
-        {
-                emit emojiSelected(index.data(Qt::UserRole).toString());
-        };
-
-private:
-        QVBoxLayout *mainLayout_;
-
-        QStandardItemModel *itemModel_;
-        QListView *emojiListView_;
-
-        emoji::Emoji *data_;
-        emoji::ItemDelegate *delegate_;
-
-        QLabel *category_;
-};
-} // namespace emoji

src/emoji/ItemDelegate.cpp

@@ -1,48 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QDebug>
-#include <QPainter>
-
-#include "emoji/ItemDelegate.h"
-
-using namespace emoji;
-
-ItemDelegate::ItemDelegate(QObject *parent)
-  : QStyledItemDelegate(parent)
-{
-        data_ = new Emoji;
-}
-
-ItemDelegate::~ItemDelegate() { delete data_; }
-
-void
-ItemDelegate::paint(QPainter *painter,
-                    const QStyleOptionViewItem &option,
-                    const QModelIndex &index) const
-{
-        Q_UNUSED(index);
-
-        QStyleOptionViewItem viewOption(option);
-
-        auto emoji = index.data(Qt::UserRole).toString();
-
-        QFont font("Emoji One");
-
-        painter->setFont(font);
-        painter->drawText(viewOption.rect, Qt::AlignCenter, emoji);
-}

src/emoji/ItemDelegate.h

@@ -1,43 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QModelIndex>
-#include <QStandardItemModel>
-#include <QStyledItemDelegate>
-
-#include "Provider.h"
-
-namespace emoji {
-
-class ItemDelegate : public QStyledItemDelegate
-{
-        Q_OBJECT
-
-public:
-        explicit ItemDelegate(QObject *parent = nullptr);
-        ~ItemDelegate();
-
-        void paint(QPainter *painter,
-                   const QStyleOptionViewItem &option,
-                   const QModelIndex &index) const override;
-
-private:
-        Emoji *data_;
-};
-} // namespace emoji

src/emoji/Panel.cpp

@@ -1,236 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QPushButton>
-#include <QScrollBar>
-#include <QVBoxLayout>
-
-#include "ui/DropShadow.h"
-#include "ui/FlatButton.h"
-
-#include "emoji/Category.h"
-#include "emoji/Panel.h"
-
-using namespace emoji;
-
-Panel::Panel(QWidget *parent)
-  : QWidget(parent)
-  , shadowMargin_{2}
-  , width_{370}
-  , height_{350}
-  , categoryIconSize_{20}
-{
-        setStyleSheet("QWidget {border: none;}"
-                      "QScrollBar:vertical { width: 0px; margin: 0px; }"
-                      "QScrollBar::handle:vertical { min-height: 30px; }");
-
-        setAttribute(Qt::WA_ShowWithoutActivating, true);
-        setWindowFlags(Qt::Tool | Qt::FramelessWindowHint | Qt::NoDropShadowWindowHint);
-
-        auto mainWidget = new QWidget(this);
-        mainWidget->setMaximumSize(width_, height_);
-
-        auto topLayout = new QVBoxLayout(this);
-        topLayout->addWidget(mainWidget);
-        topLayout->setMargin(shadowMargin_);
-        topLayout->setSpacing(0);
-
-        auto contentLayout = new QVBoxLayout(mainWidget);
-        contentLayout->setMargin(0);
-        contentLayout->setSpacing(0);
-
-        auto emojiCategories = new QFrame(mainWidget);
-
-        auto categoriesLayout = new QHBoxLayout(emojiCategories);
-        categoriesLayout->setSpacing(0);
-        categoriesLayout->setMargin(0);
-
-        QIcon icon;
-
-        auto peopleCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/people.png");
-        peopleCategory->setIcon(icon);
-        peopleCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto natureCategory_ = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/nature.png");
-        natureCategory_->setIcon(icon);
-        natureCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto foodCategory_ = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/foods.png");
-        foodCategory_->setIcon(icon);
-        foodCategory_->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto activityCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/activity.png");
-        activityCategory->setIcon(icon);
-        activityCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto travelCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/travel.png");
-        travelCategory->setIcon(icon);
-        travelCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto objectsCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/objects.png");
-        objectsCategory->setIcon(icon);
-        objectsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto symbolsCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/symbols.png");
-        symbolsCategory->setIcon(icon);
-        symbolsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        auto flagsCategory = new FlatButton(emojiCategories);
-        icon.addFile(":/icons/icons/emoji-categories/flags.png");
-        flagsCategory->setIcon(icon);
-        flagsCategory->setIconSize(QSize(categoryIconSize_, categoryIconSize_));
-
-        categoriesLayout->addWidget(peopleCategory);
-        categoriesLayout->addWidget(natureCategory_);
-        categoriesLayout->addWidget(foodCategory_);
-        categoriesLayout->addWidget(activityCategory);
-        categoriesLayout->addWidget(travelCategory);
-        categoriesLayout->addWidget(objectsCategory);
-        categoriesLayout->addWidget(symbolsCategory);
-        categoriesLayout->addWidget(flagsCategory);
-
-        scrollArea_ = new QScrollArea(this);
-        scrollArea_->setWidgetResizable(true);
-        scrollArea_->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-        auto scrollWidget = new QWidget(this);
-        auto scrollLayout = new QVBoxLayout(scrollWidget);
-
-        scrollLayout->setMargin(0);
-        scrollLayout->setSpacing(0);
-        scrollArea_->setWidget(scrollWidget);
-
-        auto peopleEmoji =
-          new Category(tr("Smileys & People"), emoji_provider_.people, scrollWidget);
-        scrollLayout->addWidget(peopleEmoji);
-
-        auto natureEmoji =
-          new Category(tr("Animals & Nature"), emoji_provider_.nature, scrollWidget);
-        scrollLayout->addWidget(natureEmoji);
-
-        auto foodEmoji = new Category(tr("Food & Drink"), emoji_provider_.food, scrollWidget);
-        scrollLayout->addWidget(foodEmoji);
-
-        auto activityEmoji = new Category(tr("Activity"), emoji_provider_.activity, scrollWidget);
-        scrollLayout->addWidget(activityEmoji);
-
-        auto travelEmoji =
-          new Category(tr("Travel & Places"), emoji_provider_.travel, scrollWidget);
-        scrollLayout->addWidget(travelEmoji);
-
-        auto objectsEmoji = new Category(tr("Objects"), emoji_provider_.objects, scrollWidget);
-        scrollLayout->addWidget(objectsEmoji);
-
-        auto symbolsEmoji = new Category(tr("Symbols"), emoji_provider_.symbols, scrollWidget);
-        scrollLayout->addWidget(symbolsEmoji);
-
-        auto flagsEmoji = new Category(tr("Flags"), emoji_provider_.flags, scrollWidget);
-        scrollLayout->addWidget(flagsEmoji);
-
-        contentLayout->addWidget(scrollArea_);
-        contentLayout->addWidget(emojiCategories);
-
-        connect(peopleEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(peopleCategory, &QPushButton::clicked, [this, peopleEmoji]() {
-                this->showCategory(peopleEmoji);
-        });
-
-        connect(natureEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(natureCategory_, &QPushButton::clicked, [this, natureEmoji]() {
-                this->showCategory(natureEmoji);
-        });
-
-        connect(foodEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(foodCategory_, &QPushButton::clicked, [this, foodEmoji]() {
-                this->showCategory(foodEmoji);
-        });
-
-        connect(activityEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(activityCategory, &QPushButton::clicked, [this, activityEmoji]() {
-                this->showCategory(activityEmoji);
-        });
-
-        connect(travelEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(travelCategory, &QPushButton::clicked, [this, travelEmoji]() {
-                this->showCategory(travelEmoji);
-        });
-
-        connect(objectsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(objectsCategory, &QPushButton::clicked, [this, objectsEmoji]() {
-                this->showCategory(objectsEmoji);
-        });
-
-        connect(symbolsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(symbolsCategory, &QPushButton::clicked, [this, symbolsEmoji]() {
-                this->showCategory(symbolsEmoji);
-        });
-
-        connect(flagsEmoji, &Category::emojiSelected, this, &Panel::emojiSelected);
-        connect(flagsCategory, &QPushButton::clicked, [this, flagsEmoji]() {
-                this->showCategory(flagsEmoji);
-        });
-}
-
-void
-Panel::showCategory(const Category *category)
-{
-        auto posToGo = category->mapToParent(QPoint()).y();
-        auto current = scrollArea_->verticalScrollBar()->value();
-
-        if (current == posToGo)
-                return;
-
-        // HACK
-        // If we want to go to a previous category and position the label at the top
-        // the 6*50 offset won't work because not all the categories have the same
-        // height. To ensure the category is at the top, we move to the top and go as
-        // normal to the next category.
-        if (current > posToGo)
-                this->scrollArea_->ensureVisible(0, 0, 0, 0);
-
-        posToGo += 6 * 50;
-        this->scrollArea_->ensureVisible(0, posToGo, 0, 0);
-}
-
-void
-Panel::paintEvent(QPaintEvent *event)
-{
-        Q_UNUSED(event);
-
-        QStyleOption opt;
-        opt.init(this);
-        QPainter p(this);
-        style()->drawPrimitive(QStyle::PE_Widget, &opt, &p, this);
-
-        DropShadow::draw(p,
-                         shadowMargin_,
-                         4.0,
-                         QColor(120, 120, 120, 92),
-                         QColor(255, 255, 255, 0),
-                         0.0,
-                         1.0,
-                         0.6,
-                         width(),
-                         height());
-}

src/emoji/Panel.h

@@ -1,66 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QScrollArea>
-
-#include "Provider.h"
-
-namespace emoji {
-
-class Category;
-
-class Panel : public QWidget
-{
-        Q_OBJECT
-
-public:
-        Panel(QWidget *parent = nullptr);
-
-signals:
-        void mouseLeft();
-        void emojiSelected(const QString &emoji);
-
-protected:
-        void leaveEvent(QEvent *event) override
-        {
-                emit leaving();
-                QWidget::leaveEvent(event);
-        }
-
-        void paintEvent(QPaintEvent *event) override;
-
-signals:
-        void leaving();
-
-private:
-        void showCategory(const Category *category);
-
-        Provider emoji_provider_;
-
-        QScrollArea *scrollArea_;
-
-        int shadowMargin_;
-
-        // Panel dimensions.
-        int width_;
-        int height_;
-
-        int categoryIconSize_;
-};
-} // namespace emoji

src/emoji/PickButton.cpp

@@ -1,82 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#include <QDebug>
-
-#include "emoji/Panel.h"
-#include "emoji/PickButton.h"
-
-using namespace emoji;
-
-// Number of milliseconds after which the panel will be hidden
-// if the mouse cursor is not on top of the widget.
-constexpr int HIDE_TIMEOUT = 300;
-
-PickButton::PickButton(QWidget *parent)
-  : FlatButton(parent)
-  , panel_{nullptr}
-{
-        connect(&hideTimer_, &QTimer::timeout, this, &PickButton::hidePanel);
-        connect(this, &QPushButton::clicked, this, [this]() {
-                if (panel_ && panel_->isVisible()) {
-                        hidePanel();
-                        return;
-                }
-
-                showPanel();
-        });
-}
-
-void
-PickButton::hidePanel()
-{
-        if (panel_ && !panel_->underMouse()) {
-                hideTimer_.stop();
-                panel_->hide();
-        }
-}
-
-void
-PickButton::showPanel()
-{
-        if (panel_.isNull()) {
-                panel_ = QSharedPointer<Panel>(new Panel(this));
-                connect(panel_.data(), &Panel::emojiSelected, this, &PickButton::emojiSelected);
-                connect(panel_.data(), &Panel::leaving, this, [this]() { panel_->hide(); });
-        }
-
-        if (panel_->isVisible())
-                return;
-
-        QPoint pos(rect().x(), rect().y());
-        pos = this->mapToGlobal(pos);
-
-        auto panel_size = panel_->sizeHint();
-
-        auto x = pos.x() - panel_size.width() + horizontal_distance_;
-        auto y = pos.y() - panel_size.height() - vertical_distance_;
-
-        panel_->move(x, y);
-        panel_->show();
-}
-
-void
-PickButton::leaveEvent(QEvent *e)
-{
-        hideTimer_.start(HIDE_TIMEOUT);
-        FlatButton::leaveEvent(e);
-}

src/emoji/PickButton.h

@@ -1,55 +0,0 @@
-/*
- * nheko Copyright (C) 2017  Konstantinos Sideris <siderisk@auth.gr>
- *
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include <QEvent>
-#include <QTimer>
-#include <QWidget>
-
-#include "ui/FlatButton.h"
-
-namespace emoji {
-
-class Panel;
-
-class PickButton : public FlatButton
-{
-        Q_OBJECT
-public:
-        explicit PickButton(QWidget *parent = nullptr);
-
-signals:
-        void emojiSelected(const QString &emoji);
-
-protected:
-        void leaveEvent(QEvent *e) override;
-
-private:
-        void showPanel();
-        void hidePanel();
-
-        // Vertical distance from panel's bottom.
-        int vertical_distance_ = 10;
-
-        // Horizontal distance from panel's bottom right corner.
-        int horizontal_distance_ = 70;
-
-        QSharedPointer<Panel> panel_;
-        QTimer hideTimer_;
-};
-} // namespace emoji

src/main.cpp

@@ -131,7 +131,6 @@ main(int argc, char *argv[])
         QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Italic.ttf");
         QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Bold.ttf");
         QFontDatabase::addApplicationFont(":/fonts/fonts/OpenSans/OpenSans-Semibold.ttf");
-        QFontDatabase::addApplicationFont(":/fonts/fonts/EmojiOne/emojione-android.ttf");
 
         app.setWindowIcon(QIcon(":/logos/nheko.png"));
 

src/timeline/TimelineItem.cpp

@@ -594,7 +594,7 @@ TimelineItem::markReceived(bool isEncrypted)
 void
 TimelineItem::generateBody(const QString &body)
 {
-        body_ = new TextLabel(replaceEmoji(body), this);
+        body_ = new TextLabel(body, this);
         body_->setTextInteractionFlags(Qt::TextSelectableByMouse | Qt::TextBrowserInteraction);
 
         connect(body_, &TextLabel::userProfileTriggered, this, [](const QString &user_id) {
@@ -667,25 +667,6 @@ TimelineItem::generateTimestamp(const QDateTime &time)
           QString("<span style=\"color: #999\"> %1 </span>").arg(time.toString("HH:mm")));
 }
 
-QString
-TimelineItem::replaceEmoji(const QString &body)
-{
-        QString fmtBody = "";
-
-        QVector<uint> utf32_string = body.toUcs4();
-
-        for (auto &code : utf32_string) {
-                // TODO: Be more precise here.
-                if (code > 9000)
-                        fmtBody += QString("<span style=\"font-family: Emoji One;\">") +
-                                   QString::fromUcs4(&code, 1) + "</span>";
-                else
-                        fmtBody += QString::fromUcs4(&code, 1);
-        }
-
-        return fmtBody;
-}
-
 void
 TimelineItem::setupAvatarLayout(const QString &userName)
 {

src/timeline/TimelineItem.h

@@ -256,7 +256,6 @@ private:
         //! has been acknowledged by the server.
         bool isReceived_ = false;
 
-        QString replaceEmoji(const QString &body);
         QString event_id_;
         QString room_id_;