summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2009-12-28 12:58:25 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2009-12-28 13:38:28 (GMT)
commit6e90192b599cee9b903177a0978198326f667613 (patch)
treeca1839ee91dbabdfcc8c6dde6532cc0361b11855 /src/gui/styles/qstylesheetstyle.cpp
parentb06313579aad82f8dda64ad14384080754f2b222 (diff)
downloadQt-6e90192b599cee9b903177a0978198326f667613.zip
Qt-6e90192b599cee9b903177a0978198326f667613.tar.gz
Qt-6e90192b599cee9b903177a0978198326f667613.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
Diffstat (limited to 'src/gui/styles/qstylesheetstyle.cpp')
-rw-r--r--src/gui/styles/qstylesheetstyle.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp
index 8b40931..aff3ac0 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]);
}