diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-27 18:50:03 (GMT) |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@nokia.com> | 2009-11-27 18:50:03 (GMT) |
| commit | c2c31f30830a4e1e455a13321dd7bae6ac8b360f (patch) | |
| tree | 8403e1619e1e41d61d7f61e272dec427cdc45f30 /src/gui/widgets | |
| parent | f93097671f512f38790ba2d56bd5b1e037810266 (diff) | |
| parent | 6c50eb3cbd4857e830daa0cc043d834bdfa4bd06 (diff) | |
| download | Qt-c2c31f30830a4e1e455a13321dd7bae6ac8b360f.zip Qt-c2c31f30830a4e1e455a13321dd7bae6ac8b360f.tar.gz Qt-c2c31f30830a4e1e455a13321dd7bae6ac8b360f.tar.bz2 | |
Merge remote branch 'staging/4.6' into 4.6
Diffstat (limited to 'src/gui/widgets')
| -rw-r--r-- | src/gui/widgets/qplaintextedit.cpp | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/gui/widgets/qplaintextedit.cpp b/src/gui/widgets/qplaintextedit.cpp index c7759e8..eae8b7d 100644 --- a/src/gui/widgets/qplaintextedit.cpp +++ b/src/gui/widgets/qplaintextedit.cpp @@ -1802,6 +1802,9 @@ void QPlainTextEdit::paintEvent(QPaintEvent *e) QTextBlock block = firstVisibleBlock(); qreal maximumWidth = document()->documentLayout()->documentSize().width(); + // Set a brush origin so that the WaveUnderline knows where the wave started + painter.setBrushOrigin(offset); + // keep right margin clean from full-width selection int maxX = offset.x() + qMax((qreal)viewportRect.width(), maximumWidth) - document()->documentMargin(); |