Revert changes to notification replay. And replace user settings with Both (Enter and Ctrl+Enter) to polls.

This commit is contained in:
Kirsan 2020-02-10 15:19:32 +03:00 committed by John Preston
parent 9c562931a2
commit 4fececb94f
2 changed files with 2 additions and 2 deletions

View File

@ -767,7 +767,7 @@ not_null<Ui::InputField*> CreatePollBox::setupQuestion(
st::createPollFieldPadding); st::createPollFieldPadding);
InitField(getDelegate()->outerContainer(), question, _session); InitField(getDelegate()->outerContainer(), question, _session);
question->setMaxLength(kQuestionLimit + kErrorLimit); question->setMaxLength(kQuestionLimit + kErrorLimit);
question->setSubmitSettings(_session->settings().sendSubmitWay()); question->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
const auto warning = CreateWarningLabel( const auto warning = CreateWarningLabel(
container, container,

View File

@ -858,7 +858,7 @@ void Notification::showReplyField() {
_replyArea->show(); _replyArea->show();
_replyArea->setFocus(); _replyArea->setFocus();
_replyArea->setMaxLength(MaxMessageSize); _replyArea->setMaxLength(MaxMessageSize);
_replyArea->setSubmitSettings(_item->history()->session().settings().sendSubmitWay()); _replyArea->setSubmitSettings(Ui::InputField::SubmitSettings::Both);
_replyArea->setInstantReplaces(Ui::InstantReplaces::Default()); _replyArea->setInstantReplaces(Ui::InstantReplaces::Default());
_replyArea->setInstantReplacesEnabled( _replyArea->setInstantReplacesEnabled(
_item->history()->session().settings().replaceEmojiValue()); _item->history()->session().settings().replaceEmojiValue());