diff options
| author | Geir Vattekar <geir.vattekar@nokia.com> | 2010-12-09 11:43:04 (GMT) |
|---|---|---|
| committer | Geir Vattekar <geir.vattekar@nokia.com> | 2010-12-09 11:43:04 (GMT) |
| commit | 3b20e58b9494549713b492e35af6531b4bc179c9 (patch) | |
| tree | 9ae3fb2e2d02a78f6f2fe36adaad364170fd704c /src/declarative/graphicsitems/qdeclarativerectangle.cpp | |
| parent | bd4ac06eb3c8ac3a9044689481873ce91aeb3180 (diff) | |
| parent | 91518478d32a5d5ce188b02f92e744fc782dd687 (diff) | |
| download | Qt-3b20e58b9494549713b492e35af6531b4bc179c9.zip Qt-3b20e58b9494549713b492e35af6531b4bc179c9.tar.gz Qt-3b20e58b9494549713b492e35af6531b4bc179c9.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-doc-team into 4.7
Diffstat (limited to 'src/declarative/graphicsitems/qdeclarativerectangle.cpp')
| -rw-r--r-- | src/declarative/graphicsitems/qdeclarativerectangle.cpp | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/src/declarative/graphicsitems/qdeclarativerectangle.cpp b/src/declarative/graphicsitems/qdeclarativerectangle.cpp index dedb3f7..99b36a8 100644 --- a/src/declarative/graphicsitems/qdeclarativerectangle.cpp +++ b/src/declarative/graphicsitems/qdeclarativerectangle.cpp @@ -470,6 +470,8 @@ void QDeclarativeRectangle::generateBorderedRect() void QDeclarativeRectangle::paint(QPainter *p, const QStyleOptionGraphicsItem *, QWidget *) { Q_D(QDeclarativeRectangle); + if (width() <= 0 || height() <= 0) + return; if (d->radius > 0 || (d->pen && d->pen->isValid()) || (d->gradient && d->gradient->gradient()) ) { drawRect(*p); @@ -539,6 +541,12 @@ void QDeclarativeRectangle::drawRect(QPainter &p) Q_ASSERT(d->rectImage.width() == 2*xOffset + 1); Q_ASSERT(d->rectImage.height() == 2*yOffset + 1); + // check whether we've eliminated the center completely + if (2*xOffset > width()+pw) + xOffset = (width()+pw)/2; + if (2*yOffset > height()+pw) + yOffset = (height()+pw)/2; + QMargins margins(xOffset, yOffset, xOffset, yOffset); QTileRules rules(Qt::StretchTile, Qt::StretchTile); //NOTE: even though our item may have qreal-based width and height, qDrawBorderPixmap only supports QRects |