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

Merge remote-tracking branch 'origin/4.4' into 4.5

Browse Source 
Change-Id: I9b7cb3d845628abf69a73a279f5a79202c0976c2
This commit is contained in:
Orgad Shaneh
2017-10-04 16:10:51 +03:00
parent 2966b7349f 6afdb8bdf9
commit 5e8e619dd0
19 changed files with 1686 additions and 1571 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1274,6 +1274,11 @@ void TextEditorWidgetPrivate::editorContentsChange(int position, int charsRemove
// lines were inserted or removed from outside, keep viewport on same part of text
if (q->firstVisibleBlock().blockNumber() > posBlock.blockNumber())
q->verticalScrollBar()->setValue(q->verticalScrollBar()->value() + newBlockCount - m_blockCount);
if (m_inBlockSelectionMode) {
disableBlockSelection(CursorUpdateClearSelection);
q->viewport()->update();
}
}
m_blockCount = newBlockCount;
m_scrollBarUpdateTimer.start(500);