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

Merge remote-tracking branch 'origin/11.0'

Browse Source 
Change-Id: I8d1c9720a868da02b3157a48954eb4e262539c84
This commit is contained in:
Eike Ziller
2023-06-15 09:48:58 +02:00
parent e7870f736d 580202f54b
commit 6c601b8cd4
67 changed files with 1046 additions and 376 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4947,15 +4947,15 @@ void TextEditorWidget::paintEvent(QPaintEvent *e)
paintBlock(&painter, data.block, data.offset, blockData.selections, data.eventRect);
if (data.isEditable && data.context.cursorPosition < -1
&& !blockData.layout->preeditAreaText().isEmpty()) {
const int cursorPos = blockData.layout->preeditAreaPosition()
- (data.context.cursorPosition + 2);
data.cursors.append(generateCursorData(cursorPos, data, blockData, painter));
}
if (drawCursor && !drawCursorAsBlock)
if (data.isEditable && !blockData.layout->preeditAreaText().isEmpty()) {
if (data.context.cursorPosition < -1) {
const int cursorPos = blockData.layout->preeditAreaPosition()
- (data.context.cursorPosition + 2);
data.cursors = {generateCursorData(cursorPos, data, blockData, painter)};
}
} else if (drawCursor && !drawCursorAsBlock) {
d->addCursorsPosition(data, painter, blockData);
}
d->paintIndentDepth(data, painter, blockData);
d->paintAdditionalVisualWhitespaces(data, painter, blockData.boundingRect.top());
d->paintReplacement(data, painter, blockData.boundingRect.top());