diff options
| author | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
|---|---|---|
| committer | Andreas Aardal Hanssen <andreas.aardal.hanssen@nokia.com> | 2009-11-11 09:33:57 (GMT) |
| commit | 6855df6110eebdbfc43211f20dd65f446ccda209 (patch) | |
| tree | dd731afb046463a7dcbe249f7ea9de0484195b2a /src/gui/widgets/qplaintextedit.cpp | |
| parent | 835a23891567831cf184e5bbaba8d00bfc912699 (diff) | |
| parent | 95db13345cd7b6b7cac8725fe2879aaf80233818 (diff) | |
| download | Qt-6855df6110eebdbfc43211f20dd65f446ccda209.zip Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.gz Qt-6855df6110eebdbfc43211f20dd65f446ccda209.tar.bz2 | |
Merge remote branch 'qt/4.6' into kinetic-declarativeui
Diffstat (limited to 'src/gui/widgets/qplaintextedit.cpp')
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index 0de7421..18adc6c 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -1465,7 +1465,7 @@ bool QPlainTextEdit::event(QEvent *e) // QPlainTextEdit scrolls by lines only in vertical direction QFontMetrics fm(document()->defaultFont()); int lineHeight = fm.height(); - int newX = hBar->value() - g->lastOffset().x(); + int newX = hBar->value() - g->delta().x(); int newY = d->originalOffsetY - offset.y()/lineHeight; hBar->setValue(newX); vBar->setValue(newY); |