diff options
author | David Boddie <david.boddie@nokia.com> | 2010-10-19 14:01:14 +0200 |
---|---|---|
committer | David Boddie <david.boddie@nokia.com> | 2010-10-19 14:01:14 +0200 |
commit | d6844c7a7e04d08932a037d98629d1eb2e3858a0 (patch) | |
tree | bd960e54ccb32974dc9d84efbb6b767547a4d7e7 /src/plugins/texteditor/basetexteditor.cpp | |
parent | 8e6569663ecbf7389b3df5d86f4ce2d1102b16c0 (diff) | |
parent | 6efdc7cff0937efeea89a5f98df725a08f1c70a2 (diff) | |
download | qt-creator-2.0.tar.gz |
Merge branch '2.0' of scm.dev.nokia.troll.no:creator/mainline into 2.02.0
Diffstat (limited to 'src/plugins/texteditor/basetexteditor.cpp')
-rw-r--r-- | src/plugins/texteditor/basetexteditor.cpp | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/src/plugins/texteditor/basetexteditor.cpp b/src/plugins/texteditor/basetexteditor.cpp index b856d941eb..71ae6141ff 100644 --- a/src/plugins/texteditor/basetexteditor.cpp +++ b/src/plugins/texteditor/basetexteditor.cpp @@ -1451,6 +1451,8 @@ void BaseTextEditor::setTextCursor(const QTextCursor &cursor) QTextCursor c = cursor; c.setVisualNavigation(true); QPlainTextEdit::setTextCursor(c); + if (!c.block().isVisible()) + expand(); if (selectionChange) slotSelectionChanged(); } @@ -3238,7 +3240,7 @@ void BaseTextEditor::updateCurrentLineHighlight() if (block.isValid()) d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect()); block = document()->findBlockByNumber(cursorBlockNumber); - if (block.isValid()) + if (block.isValid() && block.isVisible()) d->m_extraArea->update(blockBoundingGeometry(block).translated(offset).toAlignedRect()); d->m_cursorBlockNumber = cursorBlockNumber; } |