feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Editor: fix deleteEndOfWord and deleteStartOfWord

Browse Source 
If the cursor is positioned at a word boundary the action behaves
incorrect. Copy the behavior of QWidgetTextControlPrivate::keyPressEvent
which feels more natural.

Fixes: QTCREATORBUG-8977
Fixes: QTCREATORBUG-7056
Change-Id: I9dc0102023bb6234dcfa82619a976c723bc37a05
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2020-01-13 17:11:45 +01:00
parent c3e4b6c728
commit 5a4bfb2460
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/plugins/texteditor/texteditor.cpp
View File

@@ -2412,7 +2412,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
if (camelCaseNavigationEnabled())
CamelCaseCursor::left(&c, this, QTextCursor::KeepAnchor);
else
c.movePosition(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
c.movePosition(QTextCursor::PreviousWord, QTextCursor::KeepAnchor);
c.removeSelectedText();
return;
} else if (!ro && e == QKeySequence::DeleteEndOfWord && !textCursor().hasSelection()) {
@@ -2421,7 +2421,7 @@ void TextEditorWidget::keyPressEvent(QKeyEvent *e)
if (camelCaseNavigationEnabled())
CamelCaseCursor::right(&c, this, QTextCursor::KeepAnchor);
else
c.movePosition(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
c.movePosition(QTextCursor::NextWord, QTextCursor::KeepAnchor);
c.removeSelectedText();
return;
} else if (!ro && (e == QKeySequence::MoveToNextPage || e == QKeySequence::MoveToPreviousPage)
@@ -6912,7 +6912,7 @@ void TextEditorWidget::deleteEndOfLine()
void TextEditorWidget::deleteEndOfWord()
{
moveCursor(QTextCursor::EndOfWord, QTextCursor::KeepAnchor);
moveCursor(QTextCursor::NextWord, QTextCursor::KeepAnchor);
textCursor().removeSelectedText();
setTextCursor(textCursor());
}
@@ -6934,7 +6934,7 @@ void TextEditorWidget::deleteStartOfLine()
void TextEditorWidget::deleteStartOfWord()
{
moveCursor(QTextCursor::StartOfWord, QTextCursor::KeepAnchor);
moveCursor(QTextCursor::PreviousWord, QTextCursor::KeepAnchor);
textCursor().removeSelectedText();
setTextCursor(textCursor());
}