Merged InnerShadow and FastInnerShadow effects

4 files changed, 8 insertions, 198 deletions

diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp
index a2576d9..42ed280 100644
--- a/tests/auto/tst_qtgraphicaleffects.cpp
+++ b/tests/auto/tst_qtgraphicaleffects.cpp
@@ -59,7 +59,6 @@ private slots:
     void displace();
     void dropShadow();
     void fastBlur();
-    void fastInnerShadow();
     void gammaAdjust();
     void gaussianBlur();
     void glow();
@@ -435,35 +434,7 @@ void tst_qtgraphicaleffects::innerShadow()
     QCOMPARE(obj->property("source").toInt(), 0);
     QCOMPARE(obj->property("color").toString(), QString("#000000"));
     QCOMPARE(obj->property("spread").toDouble(), 0.0);
-    QCOMPARE(obj->property("transparentBorder").toBool(), false);
-
-    delete obj;
-}
-
-void tst_qtgraphicaleffects::fastInnerShadow()
-{
-    // Creation
-    QString componentStr = "import QtQuick 2.0\n"
-            "import effects 0.1\n"
-            "FastInnerShadow {"
-            "source: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}"
-            "width: 50; height: 50\n"
-            "}";
-    QDeclarativeComponent component(&engine);
-    component.setData(componentStr.toLatin1(), QUrl::fromLocalFile(""));
-    QObject *obj = component.create();
-    QTest::qWait(100);
-    QVERIFY(obj != 0);
-
-    // Default values
-    QCOMPARE(obj->property("blur").toDouble(), 0.0);
-    QCOMPARE(obj->property("horizontalOffset").toDouble(), 0.0);
-    QCOMPARE(obj->property("verticalOffset").toDouble(), 0.0);
-    QCOMPARE(obj->property("cached").toBool(), false);
-    QCOMPARE(obj->property("source").toInt(), 0);
-    QCOMPARE(obj->property("color").toString(), QString("#000000"));
-    QCOMPARE(obj->property("spread").toDouble(), 0.0);
-    QCOMPARE(obj->property("transparentBorder").toBool(), false);
+    QCOMPARE(obj->property("fast").toBool(), false);
 
     delete obj;
 }
diff --git a/tests/manual/testbed/TestBedModel.qml b/tests/manual/testbed/TestBedModel.qml
index acf5e12..58eb38b 100644
--- a/tests/manual/testbed/TestBedModel.qml
+++ b/tests/manual/testbed/TestBedModel.qml
@@ -53,8 +53,7 @@ ListModel {
     ListElement { name: "TestRadialBlur.qml"; group: "Motion Blur";  }
     ListElement { name: "TestZoomBlur.qml"; group: "Motion Blur"; last: true }
     ListElement { name: "TestDropShadow.qml"; group: "Drop Shadow" }
-    ListElement { name: "TestInnerShadow.qml"; group: "Drop Shadow" }
-    ListElement { name: "TestFastInnerShadow.qml"; group: "Drop Shadow"; last: true }
+    ListElement { name: "TestInnerShadow.qml"; group: "Drop Shadow"; last: true }
     ListElement { name: "TestLinearGradient.qml"; group: "Gradient" }
     ListElement { name: "TestConicalGradient.qml"; group: "Gradient" }
     ListElement { name: "TestRadialGradient.qml"; group: "Gradient"; last: true }
diff --git a/tests/manual/testbed/TestFastInnerShadow.qml b/tests/manual/testbed/TestFastInnerShadow.qml
deleted file mode 100644
index 28f8352..0000000
--- a/tests/manual/testbed/TestFastInnerShadow.qml
+++ /dev/null
@@ -1,166 +0,0 @@
-/****************************************************************************
-**
-** Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies).
-** All rights reserved.
-** Contact: Nokia Corporation (qt-info@nokia.com)
-**
-** This file is part of the Qt Graphical Effects module.
-**
-** $QT_BEGIN_LICENSE:BSD$
-** You may use this file under the terms of the BSD license as follows:
-**
-** "Redistribution and use in source and binary forms, with or without
-** modification, are permitted provided that the following conditions are
-** met:
-**   * Redistributions of source code must retain the above copyright
-**     notice, this list of conditions and the following disclaimer.
-**   * Redistributions in binary form must reproduce the above copyright
-**     notice, this list of conditions and the following disclaimer in
-**     the documentation and/or other materials provided with the
-**     distribution.
-**   * Neither the name of Nokia Corporation and its Subsidiary(-ies) nor
-**     the names of its contributors may be used to endorse or promote
-**     products derived from this software without specific prior written
-**     permission.
-**
-** THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
-** "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
-** LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
-** A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
-** OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
-** SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
-** LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-** OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE."
-** $QT_END_LICENSE$
-**
-****************************************************************************/
-
-import QtQuick 2.0
-import "../../../src/effects"
-
-TestCaseTemplate {
-
-    ImageSource {
-        id: imageSource
-        source: "images/butterfly.png"
-        anchors.centerIn: parent
-        forcedUpdateAnimationRunning: updateCheckBox.selected
-    }
-
-    ShaderEffectSource {
-        id: shaderEffectSource
-        sourceItem: imageSource
-        hideSource: enabledCheckBox.selected
-        smooth: true
-    }
-
-    FastInnerShadow {
-        id: effect
-        anchors.fill: imageSource
-        horizontalOffset: (offsetPicker.xValue - 0.5) * width
-        verticalOffset: (offsetPicker.yValue - 0.5) * height
-        spread: spreadSlider.value
-        blur: blurLevelSlider.value
-        color: colorPicker.color
-        visible: enabledCheckBox.selected
-        cached: cachedCheckBox.selected
-        source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource
-    }
-
-    PositionPicker {
-        id: offsetPicker
-        xValue: 0.50
-        yValue: 0.50
-    }
-
-    bgColor: bgColorPicker.color
-    controls: [
-        Control {
-            caption: "general"
-            Label {
-                caption: "horizontalOffset"
-                text: effect.horizontalOffset
-            }
-            Label {
-                caption: "verticalOffset"
-                text: effect.verticalOffset
-            }
-            Slider {
-                id: blurLevelSlider
-                minimum: 0
-                maximum: 1.0
-                value: 0.5
-                caption: "blur"
-            }
-            Slider {
-                id: spreadSlider
-                minimum: 0
-                maximum: 1.0
-                value: 0.0
-                caption: "spread"
-            }
-        },
-
-        Control {
-            caption: "color"
-            ColorPicker {
-                id: colorPicker
-                hue: 0
-                saturation: 0
-                lightness: 0
-                alpha: 1.0
-            }
-        },
-
-        Control {
-            caption: "advanced"
-            last: true
-            Label {
-                caption: "Effect size"
-                text: effect.width + "x" + effect.height
-            }
-            Label {
-                caption: "FPS"
-                text: fps
-            }
-            CheckBox {
-                id: cachedCheckBox
-                caption: "cached"
-            }
-            CheckBox {
-                id: enabledCheckBox
-                caption: "enabled"
-            }
-            CheckBox {
-                id: updateCheckBox
-                caption: "animated"
-                selected: false
-            }
-            RadioButtonColumn {
-                id: sourceType
-                value: "shaderEffectSource"
-                caption: "source type"
-                RadioButton {
-                    caption: "shaderEffectSource"
-                    selected: caption == sourceType.value
-                    onPressedChanged: sourceType.value = caption
-                }
-                RadioButton {
-                    caption: "image"
-                    selected: caption == sourceType.value
-                    onPressedChanged: {
-                        sourceType.value = caption
-                        updateCheckBox.selected = false
-                    }
-                }
-            }
-            BGColorPicker {
-                id: bgColorPicker
-                color: "#ababab"
-            }
-        }
-    ]
-}
diff --git a/tests/manual/testbed/TestInnerShadow.qml b/tests/manual/testbed/TestInnerShadow.qml
index 7c9dd47..fe4c4d1 100644
--- a/tests/manual/testbed/TestInnerShadow.qml
+++ b/tests/manual/testbed/TestInnerShadow.qml
@@ -68,6 +68,7 @@ TestCaseTemplate {
         color: colorPicker.color
         visible: enabledCheckBox.selected
         cached: cachedCheckBox.selected
+        fast: fastCheckBox.selected
         source: sourceType.value == "shaderEffectSource" ? shaderEffectSource : imageSource
     }
 
@@ -111,6 +112,11 @@ TestCaseTemplate {
                 value: 0.0
                 caption: "spread"
             }
+            CheckBox {
+                id: fastCheckBox
+                caption: "fast"
+                selected: false
+            }
         },
 
         Control {