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

Merge remote-tracking branch 'origin/qds/dev'

Browse Source 
Change-Id: Ic852bc9977d0292fb6cd93a319f4bfdebb22a1b0
This commit is contained in:
Tim Jenssen
2023-11-16 17:17:46 +01:00
parent 3a5e0299c0 245bd90a6e
commit 9f1d23df00
498 changed files with 25501 additions and 7928 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -6429,9 +6429,6 @@ void TextEditorWidget::updateFoldingHighlight(const QPoint &pos)
QTextCursor cursor = cursorForPosition(QPoint(0, pos.y()));
// Update which folder marker is highlighted
const int highlightBlockNumber = d->extraAreaHighlightFoldedBlockNumber;
d->extraAreaHighlightFoldedBlockNumber = -1;
int boxWidth = 0;
if (TextEditorSettings::fontSettings().relativeLineSpacing() == 100)
boxWidth = foldBoxWidth(fontMetrics());
@@ -6439,13 +6436,25 @@ void TextEditorWidget::updateFoldingHighlight(const QPoint &pos)
boxWidth = foldBoxWidth();
if (pos.x() > extraArea()->width() - boxWidth) {
d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
updateFoldingHighlight(cursor);
} else if (d->m_displaySettings.m_highlightBlocks) {
QTextCursor cursor = textCursor();
d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
updateFoldingHighlight(cursor);
} else {
updateFoldingHighlight(QTextCursor());
}
}
if (highlightBlockNumber != d->extraAreaHighlightFoldedBlockNumber)
void TextEditorWidget::updateFoldingHighlight(const QTextCursor &cursor)
{
const int highlightBlockNumber = d->extraAreaHighlightFoldedBlockNumber;
const bool curserIsNull = !cursor.isNull();
if (curserIsNull)
d->extraAreaHighlightFoldedBlockNumber = cursor.blockNumber();
else
d->extraAreaHighlightFoldedBlockNumber = -1;
if (curserIsNull || (highlightBlockNumber != d->extraAreaHighlightFoldedBlockNumber))
d->m_highlightBlocksTimer.start(d->m_highlightBlocksInfo.isEmpty() ? 120 : 0);
}