kotatogram/lib_ui
1
0
Fork 0
Code Issues Activity

Fix newline regression on Linux.

Browse source
This commit is contained in:
John Preston 2024-05-27 22:07:51 +04:00
parent b21a93f3ba
commit b2653606be
1 changed files with 13 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ui/widgets/fields/input_field.cpp
View file

@ -2428,7 +2428,6 @@ void InputField::documentContentsChanged(
if (_correcting) { if (_correcting) {
return; return;
} }
// In case of input method events Qt emits // In case of input method events Qt emits
// document content change signals for a whole // document content change signals for a whole
// text block where the even took place. // text block where the even took place.
@ -2949,7 +2948,19 @@ void InputField::keyPressEventInner(QKeyEvent *e) {
if (changeModifiers) { if (changeModifiers) {
e->setModifiers(oldModifiers & allowedModifiers); e->setModifiers(oldModifiers & allowedModifiers);
} }
if (e == QKeySequence::InsertParagraphSeparator) {
// qtbase commit dbb9579566f3accd8aa5fe61db9692991117afd3 introduced
// special logic for repeated 'Enter' key presses, which drops the
// block format instead of inserting a newline in case the block format
// is non-trivial. For custom fonts we use non-trivial block formats
// always for the entire QTextEdit, so we revert that logic and simply
// insert a newline as it was before Qt 6.X.Y where this was added.
textCursor().insertBlock();
_inner->ensureCursorVisible();
e->accept();
} else {
_inner->QTextEdit::keyPressEvent(e); _inner->QTextEdit::keyPressEvent(e);
}
if (changeModifiers) { if (changeModifiers) {
e->setModifiers(oldModifiers); e->setModifiers(oldModifiers);
} }