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 
Conflicts:
	cmake/QtCreatorIDEBranding.cmake
	qbs/modules/qtc/qtc.qbs
	qtcreator_ide_branding.pri
	src/plugins/clangcodemodel/clangdclient.cpp

Change-Id: I75c954d2e573d65089205d2542747bba3276be2a
This commit is contained in:
Eike Ziller
2022-01-03 14:14:12 +01:00
parent ea13ade822 cf5fc98a2c
commit 7d92375b2f
21 changed files with 159 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1397,12 +1397,14 @@ QList<QTextCursor> TextEditorWidgetPrivate::generateCursorsForBlockSelection(
while (block.isValid()) {
const QString &blockText = block.text();
cursor.setPosition(block.position()
+ tabSettings.positionAtColumn(blockText, blockSelection.anchorColumn));
cursor.setPosition(block.position()
+ tabSettings.positionAtColumn(blockText, blockSelection.column),
QTextCursor::KeepAnchor);
result.append(cursor);
const int columnCount = tabSettings.columnCountForText(blockText);
if (blockSelection.anchorColumn < columnCount || blockSelection.column < columnCount) {
const int anchor = tabSettings.positionAtColumn(blockText, blockSelection.anchorColumn);
const int position = tabSettings.positionAtColumn(blockText, blockSelection.column);
cursor.setPosition(block.position() + anchor);
cursor.setPosition(block.position() + position, QTextCursor::KeepAnchor);
result.append(cursor);
}
if (block.blockNumber() == blockSelection.blockNumber)
break;
block = forward ? block.next() : block.previous();
@@ -5234,11 +5236,6 @@ void TextEditorWidget::mouseMoveEvent(QMouseEvent *e)
MultiTextCursor cursor = *startMouseMoveCursor;
const QTextCursor anchorCursor = cursor.takeMainCursor();
const QTextCursor eventCursor = cursorForPosition(e->pos());
const int eventCursorPos = eventCursor.position();
const bool forward = anchorCursor.position() < eventCursorPos;
QTextBlock block = anchorCursor.block();
const QTextBlock end = forward ? eventCursor.block().next()
: eventCursor.block().previous();
const TabSettings tabSettings = d->m_document->tabSettings();
int eventColumn = tabSettings.columnAt(eventCursor.block().text(),
@@ -5247,18 +5244,15 @@ void TextEditorWidget::mouseMoveEvent(QMouseEvent *e)
eventColumn += int((e->pos().x() - cursorRect(eventCursor).center().x())
/ QFontMetricsF(font()).horizontalAdvance(' '));
}
int anchorColumn = tabSettings.columnAt(anchorCursor.block().text(),
anchorCursor.positionInBlock());
const TextEditorWidgetPrivate::BlockSelection blockSelection = {eventCursor.blockNumber(),
eventColumn,
anchorCursor.blockNumber(),
anchorColumn};
for (; block.isValid() && block != end; block = forward ? block.next() : block.previous()) {
const QString &blockText = block.text();
QTextCursor c = eventCursor;
c.setPosition(block.position() + tabSettings.positionAtColumn(blockText, anchorColumn));
c.setPosition(block.position() + tabSettings.positionAtColumn(blockText, eventColumn),
QTextCursor::KeepAnchor);
cursor.addCursor(c);
}
cursor.mergeCursors();
cursor.setCursors(d->generateCursorsForBlockSelection(blockSelection));
if (!cursor.isNull())
setMultiTextCursor(cursor);
} else {