diff options
| author | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-03 11:47:34 (GMT) |
|---|---|---|
| committer | Olivier Goffart <ogoffart@trolltech.com> | 2010-02-03 11:48:30 (GMT) |
| commit | cc585886ba9da17064a7fc858f5d717967da6e85 (patch) | |
| tree | 8fe69b0467799848eb961c158e8ba5fedf843b0c /src/gui/styles | |
| parent | d53315d30b38352db11063096ee3867a40bdc234 (diff) | |
| download | Qt-cc585886ba9da17064a7fc858f5d717967da6e85.zip Qt-cc585886ba9da17064a7fc858f5d717967da6e85.tar.gz Qt-cc585886ba9da17064a7fc858f5d717967da6e85.tar.bz2 | |
QStyleSheetStyle: Fix combinaison of border-image and border-radius
Regression since b4d642e639eabde5d72a4
Task-number: QTBUG-7737
Reviewed-by: Gabriel
Diffstat (limited to 'src/gui/styles')
| -rw-r--r-- | src/gui/styles/qstylesheetstyle.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/src/gui/styles/qstylesheetstyle.cpp b/src/gui/styles/qstylesheetstyle.cpp index 498313b..b36294a 100644 --- a/src/gui/styles/qstylesheetstyle.cpp +++ b/src/gui/styles/qstylesheetstyle.cpp @@ -1125,6 +1125,7 @@ void QRenderRule::fixupBorder(int nativeWidth) void QRenderRule::drawBorderImage(QPainter *p, const QRect& rect) { + setClip(p, rect); static const Qt::TileRule tileMode2TileRule[] = { Qt::StretchTile, Qt::RoundTile, Qt::StretchTile, Qt::RepeatTile, Qt::StretchTile }; @@ -1142,6 +1143,7 @@ void QRenderRule::drawBorderImage(QPainter *p, const QRect& rect) QRect(QPoint(), borderImageData->pixmap.size()), sourceMargins, QTileRules(tileMode2TileRule[borderImageData->horizStretch], tileMode2TileRule[borderImageData->vertStretch])); p->setRenderHint(QPainter::SmoothPixmapTransform, wasSmoothPixmapTransform); + unsetClip(p); } QRect QRenderRule::originRect(const QRect &rect, Origin origin) const |