diff options
| author | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
|---|---|---|
| committer | David Boddie <david.boddie@nokia.com> | 2010-09-15 17:21:39 (GMT) |
| commit | f23bce37a8a3536bfedce7cc2d57f0761b2d1e31 (patch) | |
| tree | e7dd9c7f7724df3f12fe819321e44c63f4eb0c2c /src/gui/widgets/qlineedit.cpp | |
| parent | f41eac269d354ebeb797b9cb173b09fc996564cf (diff) | |
| parent | b832dffc1eb85181aa2d99afd1a6c764b634091d (diff) | |
| download | Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.zip Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.gz Qt-f23bce37a8a3536bfedce7cc2d57f0761b2d1e31.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/gui/widgets/qlineedit.cpp')
| -rw-r--r-- | src/gui/widgets/qlineedit.cpp | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/gui/widgets/qlineedit.cpp b/src/gui/widgets/qlineedit.cpp index 981e934..caaef68 100644 --- a/src/gui/widgets/qlineedit.cpp +++ b/src/gui/widgets/qlineedit.cpp @@ -1929,7 +1929,11 @@ void QLineEdit::paintEvent(QPaintEvent *) // text doesn't fit, text document is to the left of lineRect; align // right d->hscroll = widthUsed - lineRect.width() + 1; + } else { + //in case the text is bigger than the lineedit, the hscroll can never be negative + d->hscroll = qMax(0, d->hscroll); } + // the y offset is there to keep the baseline constant in case we have script changes in the text. QPoint topLeft = lineRect.topLeft() - QPoint(d->hscroll, d->control->ascent() - fm.ascent()); |