diff options
| -rw-r--r-- | src/effects/MaskedBlur.qml | 18 | ||||
| -rw-r--r-- | tests/manual/testbed/TestMaskedBlur.qml | 17 |
2 files changed, 14 insertions, 21 deletions
diff --git a/src/effects/MaskedBlur.qml b/src/effects/MaskedBlur.qml index 1b24bf7..7e0a21e 100644 --- a/src/effects/MaskedBlur.qml +++ b/src/effects/MaskedBlur.qml @@ -51,16 +51,6 @@ Item { property bool fast: false property bool transparentBorder: false - SourceProxy { - id: sourceProxy - input: rootItem.source - } - - SourceProxy { - id: maskSourceProxy - input: rootItem.maskSource - } - Loader { id: loaderItem anchors.fill: parent @@ -71,8 +61,8 @@ Item { id: gaussianBlur GaussianMaskedBlur { anchors.fill: parent - source: sourceProxy.output - maskSource: maskSourceProxy.output + source: rootItem.source + maskSource: rootItem.maskSource radius: rootItem.radius maximumRadius: rootItem.samples * 0.5 transparentBorder: rootItem.transparentBorder @@ -84,8 +74,8 @@ Item { id: fastBlur FastMaskedBlur { anchors.fill: parent - source: sourceProxy.output - maskSource: maskSourceProxy.output + source:rootItem. source + maskSource: rootItem.maskSource blur: Math.pow(rootItem.radius / 64.0, 0.4) transparentBorder: rootItem.transparentBorder cached: rootItem.cached diff --git a/tests/manual/testbed/TestMaskedBlur.qml b/tests/manual/testbed/TestMaskedBlur.qml index 8944026..c99eb0c 100644 --- a/tests/manual/testbed/TestMaskedBlur.qml +++ b/tests/manual/testbed/TestMaskedBlur.qml @@ -44,16 +44,19 @@ import "../../../src/effects" TestCaseTemplate { ImageSource { id: imageSource - source: "images/butterfly.png" } - Rectangle { + Item { id: maskSource anchors.fill: imageSource - visible: !enabledCheckBox.selected - gradient: Gradient { - GradientStop { position: 0.3; color: Qt.rgba(maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value) } - GradientStop { position: 0.7; color: Qt.rgba(maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value) } + visible: false + Rectangle { + rotation: -90 + anchors.fill: parent + gradient: Gradient { + GradientStop { position: 0.2; color: Qt.rgba(maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value, maskAlphaBeginSlider.value) } + GradientStop { position: 0.5; color: Qt.rgba(maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value, maskAlphaEndSlider.value) } + } } } @@ -77,7 +80,7 @@ TestCaseTemplate { Slider { id: radiusSlider minimum: 0.0 - maximum: 64.0 + maximum: 32.0 value: 16.0 caption: "radius" } |