diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2009-12-28 12:58:25 (GMT) |
|---|---|---|
| committer | Iikka Eklund <iikka.eklund@digia.com> | 2011-05-23 11:20:48 (GMT) |
| commit | eb02a9c18af884412bcb94c9f9a73ee1b9c98000 (patch) | |
| tree | d2e21f695ece0dfc916e8e52ce264b5e72189a2b /src | |
| parent | d1c5883d2d0fe580ae7a55ce74df1957c41cfbf4 (diff) | |
| download | Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.zip Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.tar.gz Qt-eb02a9c18af884412bcb94c9f9a73ee1b9c98000.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)
(cherry picked from commit 71f7c1d006d0942fb91e795855bd00a35f226385)
Diffstat (limited to 'src')
| -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 7e9cf50..06a4be5 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]); } |