diff options
| author | Gunnar Sletta <gunnar.sletta@digia.com> | 2013-10-24 19:59:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-10-25 21:35:29 +0200 |
| commit | b3bff5bb3c8ee0e1c45d20d04b1c3c0236aa9d38 (patch) | |
| tree | de46a315ff40f8b33fa506ba23d86717f4355938 /src/quick/items/qquickborderimage.cpp | |
| parent | 214d4a70bec89b640a35bbdec7fdd4e5d32e5873 (diff) | |
Make sure QQuickBorderImage sets its pixmapChanged dirtyflag
Task-number: QTBUG-34298
Change-Id: Ie66f0bdd705335491496f5d583193b32cb7749f3
Reviewed-by: Alan Alpert <aalpert@blackberry.com>
Diffstat (limited to 'src/quick/items/qquickborderimage.cpp')
| -rw-r--r-- | src/quick/items/qquickborderimage.cpp | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/src/quick/items/qquickborderimage.cpp b/src/quick/items/qquickborderimage.cpp index 9fc9752707..a2e4e91755 100644 --- a/src/quick/items/qquickborderimage.cpp +++ b/src/quick/items/qquickborderimage.cpp @@ -301,7 +301,7 @@ void QQuickBorderImage::load() d->oldSourceSize = sourceSize(); emit sourceSizeChanged(); } - update(); + pixmapChange(); return; } else { if (d->url.path().endsWith(QLatin1String("sci"))) { @@ -509,7 +509,7 @@ void QQuickBorderImage::requestFinished() emit sourceSizeChanged(); } - update(); + pixmapChange(); } #define BORDERIMAGE_MAX_REDIRECT 16 @@ -561,6 +561,7 @@ QSGNode *QQuickBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat QSGImageNode *node = static_cast<QSGImageNode *>(oldNode); bool updatePixmap = d->pixmapChanged; + d->pixmapChanged = false; if (!node) { node = d->sceneGraphContext()->createImageNode(); updatePixmap = true; @@ -634,10 +635,7 @@ QSGNode *QQuickBorderImage::updatePaintNode(QSGNode *oldNode, UpdatePaintNodeDat void QQuickBorderImage::pixmapChange() { Q_D(QQuickBorderImage); - d->pixmapChanged = true; - - // When the pixmap changes, such as being deleted, we need to update the textures update(); } |