diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-28 12:58:25 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-08 11:56:06 (GMT) |
| commit | 71f7c1d006d0942fb91e795855bd00a35f226385 (patch) | |
| tree | 4b661df3aa014706bc2bd78733438e8e7a24b38b /src/gui | |
| parent | 30d45394f59c25fc2c3e7e30da4e49bf9744de76 (diff) | |
| download | Qt-71f7c1d006d0942fb91e795855bd00a35f226385.zip Qt-71f7c1d006d0942fb91e795855bd00a35f226385.tar.gz Qt-71f7c1d006d0942fb91e795855bd00a35f226385.tar.bz2 | |
QStyleSheetStyle: Fixed some text croped when having padding with native border.
The native border width need to be taken into account in QRenderRule::boxRect()
Task-number: QTBUG-6855
Reviewed-by: Benjamin Poulain
(cherry picked from commit 6e90192b599cee9b903177a0978198326f667613)
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index ca6968b..56cc364 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1065,7 +1065,7 @@ QRect QRenderRule::boxRect(const QRect& cr, int flags) const r.adjust(-p[LeftEdge], -p[TopEdge], p[RightEdge], p[BottomEdge]); } } - if (!hasNativeBorder() && (flags & Border)) { + if (hasBorder() && (flags & Border)) { const int *b = border()->borders; r.adjust(-b[LeftEdge], -b[TopEdge], b[RightEdge], b[BottomEdge]); } |