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

Editor: Simplify FoldValidator::process.

Browse Source 
Change-Id: I9181c18ae5a36f5ab0027fb36cea21f4f2a5e99c
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
David Schulz
2016-05-18 09:20:08 +02:00
parent 3aae2989b3
commit 1e90926966
1 changed files with 16 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/plugins/texteditor/textdocumentlayout.cpp
View File

@@ -655,34 +655,27 @@ void TextDocumentLayout::FoldValidator::process(QTextBlock block)
if (!previous.isValid())
return;
if ((TextDocumentLayout::isFolded(previous)
&& !TextDocumentLayout::canFold(previous))
|| (!TextDocumentLayout::isFolded(previous)
&& TextDocumentLayout::canFold(previous)
&& previous.isVisible()
&& !block.isVisible())) {
TextDocumentLayout::setFolded(previous, !TextDocumentLayout::isFolded(previous));
}
const bool preIsFolded = isFolded(previous);
const bool preCanFold = canFold(previous);
const bool isVisible = block.isVisible();
if (TextDocumentLayout::isFolded(previous) && !m_insideFold)
m_insideFold = TextDocumentLayout::foldingIndent(block);
if (preIsFolded && !preCanFold)
setFolded(previous, false);
else if (!preIsFolded && preCanFold && previous.isVisible() && !isVisible)
setFolded(previous, true);
bool toggleVisibility = false;
if (m_insideFold) {
if (TextDocumentLayout::foldingIndent(block) >= m_insideFold) {
if (block.isVisible())
toggleVisibility = true;
} else {
if (isFolded(previous) && !m_insideFold)
m_insideFold = foldingIndent(block);
bool shouldBeVisible = m_insideFold == 0;
if (!shouldBeVisible) {
shouldBeVisible = foldingIndent(block) < m_insideFold;
if (shouldBeVisible)
m_insideFold = 0;
if (!block.isVisible())
toggleVisibility = true;
}
} else if (!block.isVisible()) {
toggleVisibility = true;
}
if (toggleVisibility) {
block.setVisible(!block.isVisible());
if (shouldBeVisible != isVisible) {
block.setVisible(shouldBeVisible);
block.setLineCount(block.isVisible() ? qMax(1, block.layout()->lineCount()) : 0);
m_requestDocUpdate = true;
}