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

Editors: Fix top/bottom split with cursor visible at end of document

Browse Source 
It did not center on the text cursor.

- Fix lastVisibleBlockNumber() to return the last block if the editor is
scrolled to the bottom (and there potentially is no block located at the
very bottom edge of the editor widget).
- Fix comparison of block numbers (0-based) with line numbers (1-based)

Change-Id: I21405443bea3533e393a7cf320ded6d47f647949
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2020-03-16 10:39:30 +01:00
parent 2c3f31bc93
commit ba4a604d68
1 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -3006,15 +3006,19 @@ bool TextEditorWidget::restoreState(const QByteArray &state)
horizontalScrollBar()->setValue(hval);
if (version >= 2) {
int firstBlock, lastBlock;
stream >> firstBlock;
stream >> lastBlock;
int originalFirstBlock, originalLastBlock;
stream >> originalFirstBlock;
stream >> originalLastBlock;
// If current line was visible in the old state, make sure it is visible in the new state.
// This can happen if the height of the editor changed in the meantime
if (firstBlock <= lineVal && lineVal <= lastBlock
&& (lineVal < firstVisibleBlockNumber() || lastVisibleBlockNumber() <= lineVal)) {
const int lineBlock = lineVal - 1; // line is 1-based, blocks are 0-based
const bool originalCursorVisible = (originalFirstBlock <= lineBlock
&& lineBlock <= originalLastBlock);
const int firstBlock = firstVisibleBlockNumber();
const int lastBlock = lastVisibleBlockNumber();
const bool cursorVisible = (firstBlock <= lineBlock && lineBlock <= lastBlock);
if (originalCursorVisible && !cursorVisible)
centerCursor();
}
}
d->saveCurrentCursorPositionForNavigation();
@@ -8456,8 +8460,11 @@ int TextEditorWidget::firstVisibleBlockNumber() const
int TextEditorWidget::lastVisibleBlockNumber() const
{
QTextBlock block = blockForVerticalOffset(viewport()->height() - 1);
if (!block.isValid())
block.previous();
if (!block.isValid()) {
block = document()->lastBlock();
while (block.isValid() && !block.isVisible())
block = block.previous();
}
return block.isValid() ? block.blockNumber() : -1;
}