From 7d0d46798004fc54266550a944e36854b4963c8e Mon Sep 17 00:00:00 2001 From: mae <qt-info@nokia.com> Date: Tue, 1 Dec 2009 18:14:02 +0100 Subject: [PATCH] obey the "auto-fold first comment" option also for reloads --- src/plugins/texteditor/basetexteditor.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index e197a6fd85f..2f28b5a7630 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -629,7 +629,7 @@ void BaseTextEditorPrivate::collapseLicenseHeader() QTC_ASSERT(documentLayout, return); QTextBlock block = doc->firstBlock(); const TabSettings &ts = m_document->tabSettings(); - while (block.isValid()) { + while (block.isValid() && block.isVisible()) { TextBlockUserData *data = TextBlockUserData::canCollapse(block); if (data && block.next().isVisible()) { QChar character; @@ -1348,14 +1348,18 @@ void BaseTextEditor::setBaseTextDocument(BaseTextDocument *doc) } } +// called before reload void BaseTextEditor::memorizeCursorPosition() { d->m_tempState = saveState(); } +// called after reload void BaseTextEditor::restoreCursorPosition() { restoreState(d->m_tempState); + if (d->m_displaySettings.m_autoFoldFirstComment) + d->collapseLicenseHeader(); } QByteArray BaseTextEditor::saveState() const -- GitLab