Merge remote-tracking branch 'origin/6.0'

Change-Id: I92049adb2b200e9106513eb2275019890bd13b6c
This commit is contained in:
Eike Ziller
2022-01-19 11:42:32 +01:00
9 changed files with 69 additions and 34 deletions

View File

@@ -1467,7 +1467,7 @@ QList<QTextCursor> TextEditorWidgetPrivate::generateCursorsForBlockSelection(
while (block.isValid()) {
const QString &blockText = block.text();
const int columnCount = tabSettings.columnCountForText(blockText);
if (blockSelection.anchorColumn < columnCount || blockSelection.column < columnCount) {
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);