From 79fea49272e62605aa6635d5745d1c09ba74504a Mon Sep 17 00:00:00 2001 From: John Preston Date: Mon, 10 Dec 2018 17:26:53 +0400 Subject: [PATCH] Add updating emoji on the run. --- Telegram/SourceFiles/mainwindow.cpp | 6 ++ Telegram/SourceFiles/ui/emoji_config.cpp | 61 ++++++++++++++++--- Telegram/SourceFiles/ui/emoji_config.h | 11 ++++ .../SourceFiles/ui/widgets/input_fields.cpp | 57 +++++++++++++---- .../SourceFiles/ui/widgets/input_fields.h | 1 - 5 files changed, 115 insertions(+), 21 deletions(-) diff --git a/Telegram/SourceFiles/mainwindow.cpp b/Telegram/SourceFiles/mainwindow.cpp index 7c3006d26..6c06d7616 100644 --- a/Telegram/SourceFiles/mainwindow.cpp +++ b/Telegram/SourceFiles/mainwindow.cpp @@ -17,6 +17,7 @@ https://github.com/telegramdesktop/tdesktop/blob/master/LEGAL #include "ui/widgets/popup_menu.h" #include "ui/widgets/buttons.h" #include "ui/widgets/shadow.h" +#include "ui/emoji_config.h" #include "lang/lang_cloud_manager.h" #include "lang/lang_instance.h" #include "lang/lang_keys.h" @@ -93,6 +94,11 @@ MainWindow::MainWindow() { updateGlobalMenu(); }, lifetime()); + Ui::Emoji::Updated( + ) | rpl::start_with_next([=] { + Ui::ForceFullRepaint(this); + }, lifetime()); + setAttribute(Qt::WA_NoSystemBackground); setAttribute(Qt::WA_OpaquePaintEvent); } diff --git a/Telegram/SourceFiles/ui/emoji_config.cpp b/Telegram/SourceFiles/ui/emoji_config.cpp index 61b766282..d41429979 100644 --- a/Telegram/SourceFiles/ui/emoji_config.cpp +++ b/Telegram/SourceFiles/ui/emoji_config.cpp @@ -29,6 +29,13 @@ constexpr auto kSetVersion = uint32(1); constexpr auto kCacheVersion = uint32(3); constexpr auto kMaxId = uint32(1 << 8); +const auto kSets = { + Set{ 0, 0, "Mac" }, + Set{ 1, 205, "Android" }, + Set{ 2, 206, "Twemoji" }, + Set{ 3, 237, "EmojiOne" }, +}; + // Right now we can't allow users of Ui::Emoji to create custom sizes. // Any Instance::Instance() can invalidate Universal.id() and sprites. // So all Instance::Instance() should happen before async generations. @@ -76,12 +83,13 @@ auto SizeNormal = -1; auto SizeLarge = -1; auto SpritesCount = -1; -std::unique_ptr InstanceNormal; -std::unique_ptr InstanceLarge; -std::shared_ptr Universal; +auto InstanceNormal = std::unique_ptr(); +auto InstanceLarge = std::unique_ptr(); +auto Universal = std::shared_ptr(); +auto Updates = rpl::event_stream<>(); -std::map MainEmojiMap; -std::map> OtherEmojiMap; +auto MainEmojiMap = std::map(); +auto OtherEmojiMap = std::map>(); int RowsCount(int index) { if (index + 1 < SpritesCount) { @@ -158,9 +166,8 @@ void ClearCurrentSetId() { if (!id) { return; } - QFile(CurrentSettingPath()).remove(); QDir(SetDataPath(id)).removeRecursively(); - Universal = std::make_shared(0); + SwitchToSet(0); } void SaveToFile(int id, const QImage &image, int size, int index) { @@ -510,6 +517,45 @@ void ClearIrrelevantCache() { }); } +std::vector Sets() { + return kSets; +} + +int CurrentSetId() { + Expects(Universal != nullptr); + + return Universal->id(); +} + +bool SwitchToSet(int id) { + Expects(IsValidSetId(id)); + + if (Universal && Universal->id() == id) { + return true; + } + auto universal = std::make_shared(id); + if (!universal->ensureLoaded()) { + return false; + } + auto setting = QFile(CurrentSettingPath()); + if (!id) { + setting.remove(); + } else if (setting.open(QIODevice::WriteOnly)) { + auto stream = QDataStream(&setting); + stream.setVersion(QDataStream::Qt_5_1); + stream << qint32(id); + } + Universal = std::move(universal); + MainEmojiMap.clear(); + OtherEmojiMap.clear(); + Updates.fire({}); + return true; +} + +rpl::producer<> Updated() { + return Updates.events(); +} + int GetSizeNormal() { Expects(SizeNormal > 0); @@ -833,7 +879,6 @@ void Instance::checkUniversalImages() { } if (!Universal->ensureLoaded() && Universal->id() != 0) { ClearCurrentSetId(); - Universal->ensureLoaded(); } } diff --git a/Telegram/SourceFiles/ui/emoji_config.h b/Telegram/SourceFiles/ui/emoji_config.h index 0c332331e..99bb647c6 100644 --- a/Telegram/SourceFiles/ui/emoji_config.h +++ b/Telegram/SourceFiles/ui/emoji_config.h @@ -20,6 +20,17 @@ void Clear(); void ClearIrrelevantCache(); +struct Set { + int id = 0; + int postId = 0; + QString name; +}; + +std::vector Sets(); +int CurrentSetId(); +bool SwitchToSet(int id); +rpl::producer<> Updated(); + int GetSizeNormal(); int GetSizeLarge(); diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.cpp b/Telegram/SourceFiles/ui/widgets/input_fields.cpp index b791f5634..247594cda 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.cpp +++ b/Telegram/SourceFiles/ui/widgets/input_fields.cpp @@ -45,6 +45,49 @@ const auto kClearFormatSequence = QKeySequence("ctrl+shift+n"); const auto kMonospaceSequence = QKeySequence("ctrl+shift+m"); const auto kEditLinkSequence = QKeySequence("ctrl+k"); +class InputDocument : public QTextDocument { +public: + InputDocument(QObject *parent, const style::InputField &st); + +protected: + QVariant loadResource(int type, const QUrl &name) override; + +private: + const style::InputField &_st; + std::map _emojiCache; + rpl::lifetime _lifetime; + +}; + +InputDocument::InputDocument(QObject *parent, const style::InputField &st) +: QTextDocument(parent) +, _st(st) { + Ui::Emoji::Updated( + ) | rpl::start_with_next([=] { + _emojiCache.clear(); + }, _lifetime); +} + +QVariant InputDocument::loadResource(int type, const QUrl &name) { + if (type != QTextDocument::ImageResource + || name.scheme() != qstr("emoji")) { + return QTextDocument::loadResource(type, name); + } + const auto i = _emojiCache.find(name); + if (i != _emojiCache.end()) { + return i->second; + } + auto result = [&] { + if (const auto emoji = Ui::Emoji::FromUrl(name.toDisplayString())) { + const auto height = _st.font->height; + return QVariant(Ui::Emoji::SinglePixmap(emoji, height)); + } + return QVariant(); + }(); + _emojiCache.emplace(name, result); + return result; +} + bool IsNewline(QChar ch) { return (kNewlineChars.indexOf(ch) >= 0); } @@ -727,10 +770,6 @@ public: Inner(not_null parent) : QTextEdit(parent) { } - QVariant loadResource(int type, const QUrl &name) override { - return outer()->loadResource(type, name); - } - protected: bool viewportEvent(QEvent *e) override { return outer()->viewportEventInner(e); @@ -1141,6 +1180,8 @@ InputField::InputField( , _inner(std::make_unique(this)) , _lastTextWithTags(value) , _placeholderFactory(std::move(placeholderFactory)) { + _inner->setDocument(Ui::CreateChild(_inner.get(), _st)); + _inner->setAcceptRichText(false); resize(_st.width, _minHeight); @@ -1233,14 +1274,6 @@ bool InputField::viewportEventInner(QEvent *e) { return _inner->QTextEdit::viewportEvent(e); } -QVariant InputField::loadResource(int type, const QUrl &name) { - const auto imageName = name.toDisplayString(); - if (const auto emoji = Ui::Emoji::FromUrl(imageName)) { - return QVariant(Ui::Emoji::SinglePixmap(emoji, _st.font->height)); - } - return _inner->QTextEdit::loadResource(type, name); -} - void InputField::updatePalette() { auto p = _inner->palette(); p.setColor(QPalette::Text, _st.textFg->c); diff --git a/Telegram/SourceFiles/ui/widgets/input_fields.h b/Telegram/SourceFiles/ui/widgets/input_fields.h index efa6dccc6..11dac32de 100644 --- a/Telegram/SourceFiles/ui/widgets/input_fields.h +++ b/Telegram/SourceFiles/ui/widgets/input_fields.h @@ -341,7 +341,6 @@ private: void handleContentsChanged(); bool viewportEventInner(QEvent *e); - QVariant loadResource(int type, const QUrl &name); void handleTouchEvent(QTouchEvent *e); void updatePalette();