aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorMarko Niemelä <marko.a.niemela@nokia.com>2012-01-10 13:25:20 +0200
committerMarko Niemelä <marko.a.niemela@nokia.com>2012-01-10 13:25:20 +0200
commit143980a396c798b61726855323b6f82bb5c4bc03 (patch)
tree3573ea65a4465c87738060be60eca8aa8023d431 /src
parentc2de8fcefab55a33f7809e44bdeb90e7186c447c (diff)
Renamed property maximumRadius -> samples in many effects
Diffstat (limited to 'src')
-rw-r--r--src/effects/DropShadow.qml4
-rw-r--r--src/effects/GaussianBlur.qml6
-rw-r--r--src/effects/Glow.qml4
-rw-r--r--src/effects/InnerShadow.qml4
-rw-r--r--src/effects/MaskedBlur.qml4
-rw-r--r--src/effects/RecursiveBlur.qml2
6 files changed, 12 insertions, 12 deletions
diff --git a/src/effects/DropShadow.qml b/src/effects/DropShadow.qml
index 36dc33e..a88b3c2 100644
--- a/src/effects/DropShadow.qml
+++ b/src/effects/DropShadow.qml
@@ -45,7 +45,7 @@ Item {
id: rootItem
property variant source
property real radius: 0.0
- property int maximumRadius: 0
+ property int samples: 0
property color color: "black"
property real horizontalOffset: 0.0
property real verticalOffset: 0.0
@@ -61,7 +61,7 @@ Item {
height: parent.height
source: rootItem.source
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ samples: rootItem.samples
color: rootItem.color
cached: rootItem.cached
spread: rootItem.spread
diff --git a/src/effects/GaussianBlur.qml b/src/effects/GaussianBlur.qml
index 7c366c3..423c020 100644
--- a/src/effects/GaussianBlur.qml
+++ b/src/effects/GaussianBlur.qml
@@ -45,7 +45,7 @@ Item {
id: rootItem
property variant source
property real radius: 0.0
- property int maximumRadius: 0
+ property int samples: 0
property real deviation: (radius + 1) / 3.3333
property bool transparentBorder: false
property bool cached: false
@@ -84,7 +84,7 @@ Item {
deviation: rootItem.deviation
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ maximumRadius: rootItem.samples * 0.5
transparentBorder: rootItem.transparentBorder
}
@@ -99,7 +99,7 @@ Item {
source: sourceProxy.output
deviation: rootItem.deviation
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ maximumRadius: rootItem.samples / 2.0
transparentBorder: rootItem.transparentBorder
}
}
diff --git a/src/effects/Glow.qml b/src/effects/Glow.qml
index c7638b4..d5a9df1 100644
--- a/src/effects/Glow.qml
+++ b/src/effects/Glow.qml
@@ -45,7 +45,7 @@ Item {
id: rootItem
property variant source
property real radius: 0.0
- property int maximumRadius: 0
+ property int samples: 0
property real spread: 0.0
property color color: "white"
property bool fast: false
@@ -63,7 +63,7 @@ Item {
anchors.fill: parent
source: rootItem.source
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ maximumRadius: rootItem.samples * 0.5
color: rootItem.color
cached: rootItem.cached
spread: rootItem.spread
diff --git a/src/effects/InnerShadow.qml b/src/effects/InnerShadow.qml
index 738753d..8b4cb09 100644
--- a/src/effects/InnerShadow.qml
+++ b/src/effects/InnerShadow.qml
@@ -45,7 +45,7 @@ Item {
id: rootItem
property variant source
property real radius: 0.0
- property int maximumRadius: 0
+ property int samples: 0
property real spread: 0.0
property color color: "black"
property real horizontalOffset: 0
@@ -64,7 +64,7 @@ Item {
anchors.fill: parent
source: rootItem.source
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ maximumRadius: rootItem.samples * 0.5
color: rootItem.color
cached: rootItem.cached
spread: rootItem.spread
diff --git a/src/effects/MaskedBlur.qml b/src/effects/MaskedBlur.qml
index aeadde7..1b24bf7 100644
--- a/src/effects/MaskedBlur.qml
+++ b/src/effects/MaskedBlur.qml
@@ -46,7 +46,7 @@ Item {
property variant source
property variant maskSource
property real radius: 0.0
- property int maximumRadius: 0
+ property int samples: 0
property bool cached: false
property bool fast: false
property bool transparentBorder: false
@@ -74,7 +74,7 @@ Item {
source: sourceProxy.output
maskSource: maskSourceProxy.output
radius: rootItem.radius
- maximumRadius: rootItem.maximumRadius
+ maximumRadius: rootItem.samples * 0.5
transparentBorder: rootItem.transparentBorder
cached: rootItem.cached
}
diff --git a/src/effects/RecursiveBlur.qml b/src/effects/RecursiveBlur.qml
index 087a5a8..935bb3c 100644
--- a/src/effects/RecursiveBlur.qml
+++ b/src/effects/RecursiveBlur.qml
@@ -119,7 +119,7 @@ Item {
visible: loops > 0
anchors.fill: parent
radius: rootItem.radius
- maximumRadius: Math.ceil(rootItem.radius)
+ samples: Math.ceil(2.0 * rootItem.radius)
deviation: (radius + 1) / 2.3333
transparentBorder: rootItem.transparentBorder
cached: false