RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Allow multiline no-newline input fields. 

Fixes poll option limit warning.
This commit is contained in:
John Preston 2019-05-08 12:36:13 +03:00
parent 4293a4857f
commit d26924dd6b
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Telegram/SourceFiles/boxes/create_poll_box.cpp
View File

@ -184,6 +184,7 @@ Options::Option Options::Option::Create(
object_ptr<Ui::InputField>(
container,
st::createPollOptionField,
Ui::InputField::Mode::NoNewlines,
langFactory(lng_polls_create_option_add))));
InitField(outer, field->entity());
field->entity()->setMaxLength(kOptionLimit + kErrorLimit);

8
Telegram/SourceFiles/ui/widgets/input_fields.cpp
View File

@ -2014,8 +2014,8 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
auto *ch = textStart + qMax(changedPositionInFragment, 0);
for (; ch < textEnd; ++ch) {
const auto removeNewline = (_mode == Mode::SingleLine)
&& (IsNewline(*ch));
const auto removeNewline = (_mode != Mode::MultiLine)
&& IsNewline(*ch);
if (removeNewline) {
if (action.type == ActionType::Invalid) {
action.type = ActionType::RemoveNewline;
@ -2077,7 +2077,7 @@ void InputField::processFormatting(int insertPosition, int insertEnd) {
}
if (action.type != ActionType::Invalid) {
break;
} else if (_mode == Mode::SingleLine
} else if (_mode != Mode::MultiLine
&& block.next() != document->end()) {
action.type = ActionType::RemoveNewline;
action.intervalStart = block.next().position() - 1;
@ -2582,7 +2582,7 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier);
bool macmeta = (cPlatform() == dbipMac || cPlatform() == dbipMacOld) && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier);
bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier);
bool enterSubmit = (_mode == Mode::SingleLine)
bool enterSubmit = (_mode != Mode::MultiLine)
|| ShouldSubmit(_submitSettings, e->modifiers());
bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return);
if (e->key() == Qt::Key_Left

1
Telegram/SourceFiles/ui/widgets/input_fields.h
View File

@ -131,6 +131,7 @@ class InputField : public RpWidget, private base::Subscriber {
public:
enum class Mode {
SingleLine,
NoNewlines,
MultiLine,
};
using TagList = TextWithTags::Tags;