diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-01-06 14:09:21 (GMT) |
|---|---|---|
| committer | Jesper Thomschutz <jesper.thomschutz@nokia.com> | 2010-01-08 11:56:53 (GMT) |
| commit | eeb4b1a0a05e5e53a642d79052a631470e0a57fc (patch) | |
| tree | 6e7e6109e19c76ca024051f0c89d3ca186ac96cc /src | |
| parent | 554337bf8cc67d5f77454cf01cafbc6b91b0466c (diff) | |
| download | Qt-eeb4b1a0a05e5e53a642d79052a631470e0a57fc.zip Qt-eeb4b1a0a05e5e53a642d79052a631470e0a57fc.tar.gz Qt-eeb4b1a0a05e5e53a642d79052a631470e0a57fc.tar.bz2 | |
Revert "QStyleSheetStyle: Fixed some text croped when having padding with native border."
This reverts commit 6e90192b599cee9b903177a0978198326f667613.
his change the behaviour a little bit. It is better to wait for Qt 4.7
Reviewed-by: jbache
(cherry picked from commit 092f2014cf81d9f58670ede7d381022dd6903cbb)
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 2bc8ef6..83a863d 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 (hasBorder() && (flags & Border)) { + if (!hasNativeBorder() && (flags & Border)) { const int *b = border()->borders; r.adjust(-b[LeftEdge], -b[TopEdge], b[RightEdge], b[BottomEdge]); } |