diff options
author | Andy Nichols <andy.nichols@digia.com> | 2014-11-06 11:30:45 -0800 |
---|---|---|
committer | Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com> | 2015-05-06 14:25:38 +0000 |
commit | d0dc7cec78e182f04726c5a2adade80dc2983bcf (patch) | |
tree | 577e146a61c90cf68c7fe947efafdf791f43546b /src/quick/items/qquickborderimage.cpp | |
parent | 45212181e0510eb94f67329731fd6574a6abe3f5 (diff) |
BorderImage support for @2x assets
Despite being a subclass of QQuickImageBase, BorderImage components did
not support using @2x assets like Image components. The 9 patch image
logic now accounts for device pixel ratio when needed.
Manual tests added for stretch, repeat and round tiling modes.
[ChangeLog][BorderImage] Add support for @2x HiDPI border images.
This means, no more need to multiply the border sizes by the device
pixel ratio.
Change-Id: I79958739929964c816ba5dacedd9eaf93a60a183
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@theqtcompany.com>
Reviewed-by: Morten Johan Sørvig <morten.sorvig@theqtcompany.com>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
-rw-r--r-- | src/quick/items/qquickborderimage.cpp | 71 |
1 files changed, 39 insertions, 32 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index fc3548053c..f345a77e15 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -40,6 +40,7 @@ #include <QtNetwork/qnetworkreply.h> #include <QtCore/qfile.h> #include <QtCore/qmath.h> +#include <QtGui/qguiapplication.h> #include <private/qqmlglobal_p.h> @@ -321,7 +322,13 @@ void QQuickBorderImage::load() if (d->cache) options |= QQuickPixmap::Cache; d->pix.clear(this); - d->pix.load(qmlEngine(this), d->url, options); + + const qreal targetDevicePixelRatio = (window() ? window()->effectiveDevicePixelRatio() : qGuiApp->devicePixelRatio()); + d->devicePixelRatio = 1.0; + + QUrl loadUrl = d->url; + resolve2xLocalFile(d->url, targetDevicePixelRatio, &loadUrl, &d->devicePixelRatio); + d->pix.load(qmlEngine(this), loadUrl, d->sourcesize * d->devicePixelRatio, options); if (d->pix.isLoading()) { if (d->progress != 0.0) { @@ -329,8 +336,19 @@ void QQuickBorderImage::load() emit progressChanged(d->progress); } d->status = Loading; - d->pix.connectFinished(this, SLOT(requestFinished())); - d->pix.connectDownloadProgress(this, SLOT(requestProgress(qint64,qint64))); + + static int thisRequestProgress = -1; + static int thisRequestFinished = -1; + if (thisRequestProgress == -1) { + thisRequestProgress = + QQuickImageBase::staticMetaObject.indexOfSlot("requestProgress(qint64,qint64)"); + thisRequestFinished = + QQuickImageBase::staticMetaObject.indexOfSlot("requestFinished()"); + } + d->pix.connectFinished(this, thisRequestFinished); + d->pix.connectDownloadProgress(this, thisRequestProgress); + + update(); //pixmap may have invalidated texture, updatePaintNode needs to be called before the next repaint } else { requestFinished(); return; @@ -495,7 +513,7 @@ void QQuickBorderImage::requestFinished() } } - setImplicitSize(impsize.width(), impsize.height()); + setImplicitSize(impsize.width() / d->devicePixelRatio, impsize.height() / d->devicePixelRatio); emit statusChanged(d->status); if (sourceSize() != d->oldSourceSize) { d->oldSourceSize = sourceSize(); @@ -569,40 +587,29 @@ QSGNode *QQuickBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat QRectF innerTargetRect = targetRect; if (d->border) { const QQuickScaleGrid *border = d->getScaleGrid(); - innerSourceRect = QRectF(border->left() / qreal(d->pix.width()), - border->top() / qreal(d->pix.height()), - qMax<qreal>(0, d->pix.width() - border->right() - border->left()) / d->pix.width(), - qMax<qreal>(0, d->pix.height() - border->bottom() - border->top()) / d->pix.height()); + innerSourceRect = QRectF(border->left() * d->devicePixelRatio / qreal(d->pix.width()), + border->top() * d->devicePixelRatio / qreal(d->pix.height()), + qMax<qreal>(0, d->pix.width() - (border->right() + border->left()) * d->devicePixelRatio) / d->pix.width(), + qMax<qreal>(0, d->pix.height() - (border->bottom() + border->top()) * d->devicePixelRatio) / d->pix.height()); innerTargetRect = QRectF(border->left(), border->top(), - qMax<qreal>(0, width() - border->right() - border->left()), - qMax<qreal>(0, height() - border->bottom() - border->top())); + qMax<qreal>(0, width() - (border->right() + border->left())), + qMax<qreal>(0, height() - (border->bottom() + border->top()))); } qreal hTiles = 1; qreal vTiles = 1; - if (innerSourceRect.width() != 0) { - switch (d->horizontalTileMode) { - case QQuickBorderImage::Repeat: - hTiles = innerTargetRect.width() / qreal(innerSourceRect.width() * d->pix.width()); - break; - case QQuickBorderImage::Round: - hTiles = qCeil(innerTargetRect.width() / qreal(innerSourceRect.width() * d->pix.width())); - break; - default: - break; - } + const QSizeF innerTargetSize = innerTargetRect.size() * d->devicePixelRatio; + if (innerSourceRect.width() != 0 + && d->horizontalTileMode != QQuickBorderImage::Stretch) { + hTiles = innerTargetSize.width() / qreal(innerSourceRect.width() * d->pix.width()); + if (d->horizontalTileMode == QQuickBorderImage::Round) + hTiles = qCeil(hTiles); } - if (innerSourceRect.height() != 0) { - switch (d->verticalTileMode) { - case QQuickBorderImage::Repeat: - vTiles = innerTargetRect.height() / qreal(innerSourceRect.height() * d->pix.height()); - break; - case QQuickBorderImage::Round: - vTiles = qCeil(innerTargetRect.height() / qreal(innerSourceRect.height() * d->pix.height())); - break; - default: - break; - } + if (innerSourceRect.height() != 0 + && d->verticalTileMode != QQuickBorderImage::Stretch) { + vTiles = innerTargetSize.height() / qreal(innerSourceRect.height() * d->pix.height()); + if (d->verticalTileMode == QQuickBorderImage::Round) + vTiles = qCeil(vTiles); } node->setTargetRect(targetRect); |