Merge remote-tracking branch 'origin/4.11'

Change-Id: Ieb0bb1ebab9a5efb42d15bbeac2cd4c46a6de962
This commit is contained in:
Eike Ziller
2019-12-18 09:02:56 +01:00
30 changed files with 231 additions and 43 deletions

View File

@@ -371,15 +371,20 @@ void FancyLineEdit::onEditingFinished()
void FancyLineEdit::keyPressEvent(QKeyEvent *event)
{
const QTextCursor::MoveMode mode = (event->modifiers() & Qt::ShiftModifier)
? QTextCursor::KeepAnchor : QTextCursor::MoveAnchor;
if (camelCaseNavigation && event == QKeySequence::MoveToPreviousWord)
CamelCaseCursor::left(this, mode);
else if (camelCaseNavigation && event == QKeySequence::MoveToNextWord)
CamelCaseCursor::right(this, mode);
else
if (camelCaseNavigation) {
if (event == QKeySequence::MoveToPreviousWord)
CamelCaseCursor::left(this, QTextCursor::MoveAnchor);
else if (event == QKeySequence::SelectPreviousWord)
CamelCaseCursor::left(this, QTextCursor::KeepAnchor);
else if (event == QKeySequence::MoveToNextWord)
CamelCaseCursor::right(this, QTextCursor::MoveAnchor);
else if (event == QKeySequence::SelectNextWord)
CamelCaseCursor::right(this, QTextCursor::KeepAnchor);
else
QLineEdit::keyPressEvent(event);
} else {
QLineEdit::keyPressEvent(event);
}
}
void FancyLineEdit::setCamelCaseNavigationEnabled(bool enabled)