kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Allow only Ctrl modifier for Backspace on Linux.

Browse source
This commit is contained in:
John Preston 2020-12-30 17:49:54 +04:00
parent 17eb0f22b4
commit b5fb343d6c
1 changed files with 27 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
ui/widgets/input_fields.cpp
View file

@ -2630,12 +2630,18 @@ bool InputField::ShouldSubmit(
} }
void InputField::keyPressEventInner(QKeyEvent *e) { void InputField::keyPressEventInner(QKeyEvent *e) {
bool shift = e->modifiers().testFlag(Qt::ShiftModifier), alt = e->modifiers().testFlag(Qt::AltModifier); const auto shift = e->modifiers().testFlag(Qt::ShiftModifier);
bool macmeta = Platform::IsMac() && e->modifiers().testFlag(Qt::ControlModifier) && !e->modifiers().testFlag(Qt::MetaModifier) && !e->modifiers().testFlag(Qt::AltModifier); const auto alt = e->modifiers().testFlag(Qt::AltModifier);
bool ctrl = e->modifiers().testFlag(Qt::ControlModifier) || e->modifiers().testFlag(Qt::MetaModifier); const auto macmeta = Platform::IsMac()
bool enterSubmit = (_mode != Mode::MultiLine) && e->modifiers().testFlag(Qt::ControlModifier)
&& !e->modifiers().testFlag(Qt::MetaModifier)
&& !e->modifiers().testFlag(Qt::AltModifier);
const auto ctrl = e->modifiers().testFlag(Qt::ControlModifier)
|| e->modifiers().testFlag(Qt::MetaModifier);
const auto enterSubmit = (_mode != Mode::MultiLine)
|| ShouldSubmit(_submitSettings, e->modifiers()); || ShouldSubmit(_submitSettings, e->modifiers());
bool enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return); const auto enter = (e->key() == Qt::Key_Enter || e->key() == Qt::Key_Return);
const auto backspace = (e->key() == Qt::Key_Backspace);
if (e->key() == Qt::Key_Left if (e->key() == Qt::Key_Left
|| e->key() == Qt::Key_Right || e->key() == Qt::Key_Right
|| e->key() == Qt::Key_Up || e->key() == Qt::Key_Up
@ -2645,12 +2651,12 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
_reverseMarkdownReplacement = false; _reverseMarkdownReplacement = false;
} }
if (macmeta && e->key() == Qt::Key_Backspace) { if (macmeta && backspace) {
QTextCursor tc(textCursor()), start(tc); QTextCursor tc(textCursor()), start(tc);
start.movePosition(QTextCursor::StartOfLine); start.movePosition(QTextCursor::StartOfLine);
tc.setPosition(start.position(), QTextCursor::KeepAnchor); tc.setPosition(start.position(), QTextCursor::KeepAnchor);
tc.removeSelectedText(); tc.removeSelectedText();
} else if (e->key() == Qt::Key_Backspace } else if (backspace
&& e->modifiers() == 0 && e->modifiers() == 0
&& revertFormatReplace()) { && revertFormatReplace()) {
e->accept(); e->accept();
@ -2687,12 +2693,22 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
} else { } else {
const auto text = e->text(); const auto text = e->text();
const auto oldPosition = textCursor().position(); const auto oldPosition = textCursor().position();
if (enter && ctrl) { const auto oldModifiers = e->modifiers();
e->setModifiers(e->modifiers() & ~Qt::ControlModifier); const auto allowedModifiers = (enter && ctrl)
} else if (enter && shift) { ? (~Qt::ControlModifier)
e->setModifiers(e->modifiers() & ~Qt::ShiftModifier); : (enter && shift)
? (~Qt::ShiftModifier)
: (backspace && Platform::IsLinux())
? (Qt::ControlModifier)
: oldModifiers;
const auto changeModifiers = (oldModifiers & ~allowedModifiers) != 0;
if (changeModifiers) {
e->setModifiers(oldModifiers & allowedModifiers);
} }
_inner->QTextEdit::keyPressEvent(e); _inner->QTextEdit::keyPressEvent(e);
if (changeModifiers) {
e->setModifiers(oldModifiers);
}
auto cursor = textCursor(); auto cursor = textCursor();
if (cursor.position() == oldPosition) { if (cursor.position() == oldPosition) {
bool check = false; bool check = false;