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

Merge remote-tracking branch 'origin/4.5'

Browse Source 
Change-Id: Ic7c16091268083c0426cf29f0691a7ee458f2bd9
This commit is contained in:
Eike Ziller
2017-12-07 09:16:01 +01:00
parent 8f1a161c64 4514208af2
commit a2739f55ed
23 changed files with 173 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2809,24 +2809,19 @@ void TextEditorWidget::gotoLine(int line, int column, bool centerLine, bool anim
const DisplaySettings &ds = d->m_displaySettings;
if (animate && ds.m_animateNavigationWithinFile) {
const QScrollBar *scrollBar = verticalScrollBar();
QScrollBar *scrollBar = verticalScrollBar();
const int start = scrollBar->value();
setTextCursor(cursor);
ensureBlockIsUnfolded(block);
const int visibleLines = lastVisibleLine() - firstVisibleLine();
int end = 0;
auto it = document()->firstBlock();
while (it.isValid() && it != block) {
if (it.isVisible())
++end;
it = it.next();
}
setUpdatesEnabled(false);
setTextCursor(cursor);
if (centerLine)
end = qMin(scrollBar->maximum(), qMax(scrollBar->minimum(), end - visibleLines / 2));
centerCursor();
else
ensureCursorVisible();
const int end = scrollBar->value();
scrollBar->setValue(start);
setUpdatesEnabled(true);
const int delta = end - start;
// limit the number of steps for the animation otherwise you wont be able to tell