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

Merge remote-tracking branch 'origin/6.0'

Browse Source 
Change-Id: I405e3f95b0cdcd7b2686f31baae16c03c787f007
This commit is contained in:
Eike Ziller
2022-01-06 10:46:57 +01:00
parent 2f71b49399 243521380b
commit 65e8c864af
145 changed files with 2686 additions and 472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6674,9 +6674,9 @@ void TextEditorWidget::focusOutEvent(QFocusEvent *e)
void TextEditorWidgetPrivate::maybeSelectLine()
{
if (q->textCursor().hasSelection() && !q->multiTextCursor().hasMultipleCursors())
return;
MultiTextCursor cursor = m_cursors;
if (cursor.hasSelection())
return;
for (QTextCursor &c : cursor) {
const QTextBlock &block = m_document->document()->findBlock(c.selectionStart());
const QTextBlock &end = m_document->document()->findBlock(c.selectionEnd()).next();
@@ -7257,9 +7257,10 @@ void TextEditorWidget::cut()
void TextEditorWidget::selectAll()
{
QTextCursor c = textCursor();
c.select(QTextCursor::Document);
doSetTextCursor(c);
QPlainTextEdit::selectAll();
// Directly update the internal multi text cursor here to prevent calling setTextCursor.
// This would indirectly makes sure the cursor is visible which is not desired for select all.
const_cast<MultiTextCursor &>(d->m_cursors).setCursors({QPlainTextEdit::textCursor()});
}
void TextEditorWidget::copy()