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

TextEditor: Fix jump to search result

Browse Source 
Change-Id: Ie570936b0b96290d95999b8b501c12610ebfc9a8
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Artem Sokolovskii
2024-02-28 16:42:24 +01:00
parent a2be1e9692
commit 49ab0c4109
1 changed files with 25 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3502,18 +3502,19 @@ bool TextEditorWidget::singleShotAfterHighlightingDone(std::function<void()> &&f
[f = std::move(f)] { f(); }, Qt::SingleShotConnection); [f = std::move(f)] { f(); }, Qt::SingleShotConnection);
return true; return true;
} }
return false; return false;
} }
void TextEditorWidget::restoreState(const QByteArray &state) void TextEditorWidget::restoreState(const QByteArray &state)
{ {
if (singleShotAfterHighlightingDone([this, state] { restoreState(state); }))
return;
const auto callFoldLicenseHeader = [this] { const auto callFoldLicenseHeader = [this] {
if (d->m_displaySettings.m_autoFoldFirstComment) auto callFold = [this] {
d->foldLicenseHeader(); if (d->m_displaySettings.m_autoFoldFirstComment)
d->foldLicenseHeader();
};
if (!singleShotAfterHighlightingDone(callFold))
callFold();
}; };
if (state.isEmpty()) { if (state.isEmpty()) {
@@ -3536,21 +3537,25 @@ void TextEditorWidget::restoreState(const QByteArray &state)
if (version >= 1) { if (version >= 1) {
QList<int> collapsedBlocks; QList<int> collapsedBlocks;
stream >> collapsedBlocks; stream >> collapsedBlocks;
QTextDocument *doc = document(); auto foldingRestore = [this, collapsedBlocks] {
bool layoutChanged = false; QTextDocument *doc = document();
for (const int blockNumber : std::as_const(collapsedBlocks)) { bool layoutChanged = false;
QTextBlock block = doc->findBlockByNumber(qMax(0, blockNumber)); for (const int blockNumber : std::as_const(collapsedBlocks)) {
if (block.isValid()) { QTextBlock block = doc->findBlockByNumber(qMax(0, blockNumber));
TextDocumentLayout::doFoldOrUnfold(block, false); if (block.isValid()) {
layoutChanged = true; TextDocumentLayout::doFoldOrUnfold(block, false);
layoutChanged = true;
}
} }
} if (layoutChanged) {
if (layoutChanged) { auto documentLayout = qobject_cast<TextDocumentLayout *>(doc->documentLayout());
auto documentLayout = qobject_cast<TextDocumentLayout*>(doc->documentLayout()); QTC_ASSERT(documentLayout, return);
QTC_ASSERT(documentLayout, return ); documentLayout->requestUpdate();
documentLayout->requestUpdate(); documentLayout->emitDocumentSizeChanged();
documentLayout->emitDocumentSizeChanged(); }
} };
if (!singleShotAfterHighlightingDone(foldingRestore))
foldingRestore();
} else { } else {
callFoldLicenseHeader(); callFoldLicenseHeader();
} }