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

Merge remote-tracking branch 'origin/8.0'

Browse Source 
Change-Id: Icbb87ac8bcee5fb86042d3863a973573510651b4
This commit is contained in:
hjk
2022-08-05 08:48:22 +02:00
parent 0da5ade118 5d85c4dbdf
commit ed8c775def
31 changed files with 440 additions and 380 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/plugins/texteditor/textdocument.cpp
View File

@@ -970,6 +970,13 @@ void TextDocument::updateLayout() const
documentLayout->requestUpdate();
}
void TextDocument::scheduleUpdateLayout() const
{
auto documentLayout = qobject_cast<TextDocumentLayout*>(d->m_document.documentLayout());
QTC_ASSERT(documentLayout, return);
documentLayout->scheduleUpdate();
}
TextMarks TextDocument::marks() const
{
return d->m_marksCache;
@@ -999,7 +1006,7 @@ bool TextDocument::addMark(TextMark *mark)
bool fullUpdate = !documentLayout->hasMarks;
documentLayout->hasMarks = true;
if (fullUpdate)
documentLayout->requestUpdate();
documentLayout->scheduleUpdate();
else
documentLayout->requestExtraAreaUpdate();
return true;
@@ -1056,7 +1063,7 @@ void TextDocument::removeMark(TextMark *mark)
removeMarkFromMarksCache(mark);
emit markRemoved(mark);
mark->setBaseTextDocument(nullptr);
updateLayout();
scheduleUpdateLayout();
}
void TextDocument::updateMark(TextMark *mark)
@@ -1068,7 +1075,7 @@ void TextDocument::updateMark(TextMark *mark)
userData->removeMark(mark);
userData->addMark(mark);
}
updateLayout();
scheduleUpdateLayout();
}
void TextDocument::moveMark(TextMark *mark, int previousLine)