From 4fececb94f97d39cb3368ea983f173a7bd05990e Mon Sep 17 00:00:00 2001 From: Kirsan <17767561+kirsan31@users.noreply.github.com> Date: Mon, 10 Feb 2020 15:19:32 +0300 Subject: [PATCH] Revert changes to notification replay. And replace user settings with Both (Enter and Ctrl+Enter) to polls. --- Telegram/SourceFiles/boxes/create_poll_box.cpp | 2 +- Telegram/SourceFiles/window/notifications_manager_default.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Telegram/SourceFiles/boxes/create_poll_box.cpp b/Telegram/SourceFiles/boxes/create_poll_box.cpp index 6b11472b9d..510b91bea0 100644 --- a/Telegram/SourceFiles/boxes/create_poll_box.cpp +++ b/Telegram/SourceFiles/boxes/create_poll_box.cpp @@ -767,7 +767,7 @@ not_null CreatePollBox::setupQuestion( st::createPollFieldPadding); InitField(getDelegate()->outerContainer(), question, _session); question->setMaxLength(kQuestionLimit + kErrorLimit); - question->setSubmitSettings(_session->settings().sendSubmitWay()); + question->setSubmitSettings(Ui::InputField::SubmitSettings::Both); const auto warning = CreateWarningLabel( container, diff --git a/Telegram/SourceFiles/window/notifications_manager_default.cpp b/Telegram/SourceFiles/window/notifications_manager_default.cpp index 288f034196..b70b25fe3f 100644 --- a/Telegram/SourceFiles/window/notifications_manager_default.cpp +++ b/Telegram/SourceFiles/window/notifications_manager_default.cpp @@ -858,7 +858,7 @@ void Notification::showReplyField() { _replyArea->show(); _replyArea->setFocus(); _replyArea->setMaxLength(MaxMessageSize); - _replyArea->setSubmitSettings(_item->history()->session().settings().sendSubmitWay()); + _replyArea->setSubmitSettings(Ui::InputField::SubmitSettings::Both); _replyArea->setInstantReplaces(Ui::InstantReplaces::Default()); _replyArea->setInstantReplacesEnabled( _item->history()->session().settings().replaceEmojiValue());