summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authormae <qt-info@nokia.com>2011-04-26 15:41:21 +0200
committerOlivier Goffart <olivier.goffart@nokia.com>2011-05-10 12:54:49 +0200
commit4d38a48a7005ac279bdde5048f2f2152eed3407a (patch)
treef539fb69e8f25fba25b1caf39df5495c2031eef1 /src
parentd4eedda7d241128f36f7e812b8261429257d44a0 (diff)
Fix insert and scroll to bottom case
When using QtextCursor::insert() with a large text followed by setting the vertical scrollbar to its maximum value (scroll to bottom), QPlainTextEdit would not behave properly if a document size change was triggered by the insertion due to line wrapping. This was visible in Qt Creator. Auto test included. Reviewed-by: con (cherry picked from commit 5d144faf3c524ab557b88f69c4b755e20237e846)
Diffstat (limited to 'src')
-rw-r--r--src/gui/widgets/qplaintextedit.cpp5
1 files changed, 5 insertions, 0 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp
index 7435691bf0..e7761a1613 100644
--- a/src/gui/widgets/qplaintextedit.cpp
+++ b/src/gui/widgets/qplaintextedit.cpp
@@ -648,6 +648,11 @@ void QPlainTextEditPrivate::setTopBlock(int blockNumber, int lineNumber, int dx)
}
control->topBlock = blockNumber;
topLine = lineNumber;
+
+ bool vbarSignalsBlocked = vbar->blockSignals(true);
+ vbar->setValue(block.firstLineNumber() + lineNumber);
+ vbar->blockSignals(vbarSignalsBlocked);
+
if (dx || dy)
viewport->scroll(q->isRightToLeft() ? -dx : dx, dy);
else