summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGunnar Sletta <gunnar.sletta@digia.com>2013-02-05 16:09:39 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-02-06 09:07:42 +0100
commitb87ed762241f6415c20338ccf896ab9beb3d7cea (patch)
tree53ba38648ebc59b33be7829d3f0853f2f2b91bbe
parentb4ac3d733eae9cfcf929f3ae4a50fc20d24dc808 (diff)
downloadqtgraphicaleffects-b87ed762241f6415c20338ccf896ab9beb3d7cea.tar.gz
Propegate "transparentBorder" to the correct ShaderEffectSource
The SourceProxy in the internal GaussianGlow class propegated the sourceRect, but at that point it was already too late as the source is already wrapped in another SourceProxy (as a ShaderEffectSource) which only had the default sourceRectangle. Task-number: QTBUG-29259 Change-Id: Iaf5ee44a2ef0d962e254fd52fc021aecd757221d Reviewed-by: Samuel Rødal <samuel.rodal@digia.com>
-rw-r--r--src/effects/DropShadow.qml1
-rw-r--r--src/effects/Glow.qml1
2 files changed, 2 insertions, 0 deletions
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index 538faf6..52cb409 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -391,6 +391,7 @@ Item {
SourceProxy {
id: sourceProxy
input: rootItem.source
+ sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0)
}
ShaderEffect {
anchors.fill: parent
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index c95c846..024915b 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -295,6 +295,7 @@ Item {
SourceProxy {
id: sourceProxy
input: rootItem.source
+ sourceRect: rootItem.transparentBorder ? Qt.rect(-1, -1, parent.width + 2.0, parent.height + 2.0) : Qt.rect(0, 0, 0, 0)
}
ShaderEffect {
anchors.fill: parent