From 10fa6f0c13ac8c9fde0903600170cf1d4c8afcc5 Mon Sep 17 00:00:00 2001 From: John Preston Date: Fri, 25 May 2018 20:47:29 +0300 Subject: [PATCH] Ignore 'Replace emoji' setting in markdown. Partially fixes #4727. Fixes #4731. --- Telegram/SourceFiles/boxes/edit_caption_box.cpp | 2 +- Telegram/SourceFiles/boxes/send_files_box.cpp | 2 +- Telegram/SourceFiles/chat_helpers/message_field.cpp | 2 +- Telegram/SourceFiles/window/notifications_manager_default.cpp | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Telegram/SourceFiles/boxes/edit_caption_box.cpp b/Telegram/SourceFiles/boxes/edit_caption_box.cpp index 77070a0cf..7ab5ddc97 100644 --- a/Telegram/SourceFiles/boxes/edit_caption_box.cpp +++ b/Telegram/SourceFiles/boxes/edit_caption_box.cpp @@ -145,7 +145,7 @@ EditCaptionBox::EditCaptionBox( _field->setSubmitSettings(Ui::InputField::SubmitSettings::Both); _field->setInstantReplaces(Ui::InstantReplaces::Default()); _field->setInstantReplacesEnabled(Global::ReplaceEmojiValue()); - _field->setMarkdownReplacesEnabled(Global::ReplaceEmojiValue()); + _field->setMarkdownReplacesEnabled(rpl::single(true)); } void EditCaptionBox::prepareGifPreview(DocumentData *document) { diff --git a/Telegram/SourceFiles/boxes/send_files_box.cpp b/Telegram/SourceFiles/boxes/send_files_box.cpp index 48a42e239..e13b8d8b9 100644 --- a/Telegram/SourceFiles/boxes/send_files_box.cpp +++ b/Telegram/SourceFiles/boxes/send_files_box.cpp @@ -1578,7 +1578,7 @@ void SendFilesBox::setupCaption() { }); _caption->setInstantReplaces(Ui::InstantReplaces::Default()); _caption->setInstantReplacesEnabled(Global::ReplaceEmojiValue()); - _caption->setMarkdownReplacesEnabled(Global::ReplaceEmojiValue()); + _caption->setMarkdownReplacesEnabled(rpl::single(true)); } void SendFilesBox::captionResized() { diff --git a/Telegram/SourceFiles/chat_helpers/message_field.cpp b/Telegram/SourceFiles/chat_helpers/message_field.cpp index 7affe6c93..446149185 100644 --- a/Telegram/SourceFiles/chat_helpers/message_field.cpp +++ b/Telegram/SourceFiles/chat_helpers/message_field.cpp @@ -147,7 +147,7 @@ void InitMessageField(not_null field) { field->customTab(true); field->setInstantReplaces(Ui::InstantReplaces::Default()); field->setInstantReplacesEnabled(Global::ReplaceEmojiValue()); - field->setMarkdownReplacesEnabled(Global::ReplaceEmojiValue()); + field->setMarkdownReplacesEnabled(rpl::single(true)); } bool HasSendText(not_null field) { diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index 56bba694d..510b65ceb 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -773,7 +773,7 @@ void Notification::showReplyField() { _replyArea->setSubmitSettings(Ui::InputField::SubmitSettings::Both); _replyArea->setInstantReplaces(Ui::InstantReplaces::Default()); _replyArea->setInstantReplacesEnabled(Global::ReplaceEmojiValue()); - _replyArea->setMarkdownReplacesEnabled(Global::ReplaceEmojiValue()); + _replyArea->setMarkdownReplacesEnabled(rpl::single(true)); // Catch mouse press event to activate the window. QCoreApplication::instance()->installEventFilter(this);