summaryrefslogtreecommitdiffstats
path: root/src/gui/styles/qstylesheetstyle.cpp
diff options
context:
space:
mode:
authorOlivier Goffart <ogoffart@trolltech.com>2010-01-06 14:09:21 (GMT)
committerOlivier Goffart <ogoffart@trolltech.com>2010-01-06 15:10:30 (GMT)
commit092f2014cf81d9f58670ede7d381022dd6903cbb (patch)
treeb66f182077ebc86c23331f44935ea19bf8b8f8d4 /src/gui/styles/qstylesheetstyle.cpp
parenta6eb1a3ef2c897f1ebca01a7d7bd1a073799e737 (diff)
downloadQt-092f2014cf81d9f58670ede7d381022dd6903cbb.zip
Qt-092f2014cf81d9f58670ede7d381022dd6903cbb.tar.gz
Qt-092f2014cf81d9f58670ede7d381022dd6903cbb.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
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 aff3ac0..8b40931 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]);
}