diff options
| -rw-r--r-- | doc/src/qtgraphicaleffects-blend.qdoc | 56 | ||||
| -rw-r--r-- | doc/src/snippets/Blend-example.qml | 2 | ||||
| -rw-r--r-- | src/effects/Blend.qml | 4 | ||||
| -rw-r--r-- | tests/auto/tst_qtgraphicaleffects.cpp | 4 | ||||
| -rw-r--r-- | tests/manual/testbed/TestBlend.qml | 2 | ||||
| -rw-r--r-- | tools/pngdumper/ItemModel.qml | 2 |
6 files changed, 35 insertions, 35 deletions
diff --git a/doc/src/qtgraphicaleffects-blend.qdoc b/doc/src/qtgraphicaleffects-blend.qdoc index f383696..b3bfa11 100644 --- a/doc/src/qtgraphicaleffects-blend.qdoc +++ b/doc/src/qtgraphicaleffects-blend.qdoc @@ -34,7 +34,7 @@ \table \header - \o backgroundSource + \o source \o foregroundSource \o Effect applied \row @@ -63,7 +63,7 @@ \o Effect internal \o 0 MB \row - \o ShaderEffectSource for backgroundSource (if used) + \o ShaderEffectSource for source (if used) \o 1.2 MB \row \o ShaderEffectSource for foregroundSource (if used) @@ -79,7 +79,7 @@ */ /*! - \qmlproperty variant QtGraphicalEffects::Blend::backgroundSource + \qmlproperty variant QtGraphicalEffects::Blend::source This property defines the source item that is going to be the base when \l foregroundSource is blended over it. @@ -88,14 +88,14 @@ /*! \qmlproperty variant QtGraphicalEffects::Blend::foregroundSource - This property defines the item that is going to be blended over the \l backgroundSource. + This property defines the item that is going to be blended over the \l source. */ /*! \qmlproperty string QtGraphicalEffects::Blend::mode - This property defines the mode which is used when foregroundSource is blended over backgroundSource. Values are + This property defines the mode which is used when foregroundSource is blended over source. Values are case insensitive. \table @@ -104,76 +104,76 @@ \o description \row \o normal - \o The pixel component values from foregroundSource are written over backgroundSource by using alpha blending. + \o The pixel component values from foregroundSource are written over source by using alpha blending. \row \o addition - \o The pixel component values from backgroundSource and foregroundSource are added together and written. + \o The pixel component values from source and foregroundSource are added together and written. \row \o average - \o The pixel component values from backgroundSource and foregroundSource are averaged and written. + \o The pixel component values from source and foregroundSource are averaged and written. \row \o color - \o The lightness value from backgroundSource is combined with hue and saturation from foregroundSource and written. + \o The lightness value from source is combined with hue and saturation from foregroundSource and written. \row \o colorBurn - \o The darker pixels from backgroundSource are darkened more, if both backgroundSource and foregroundSource pixels are light the result is light. + \o The darker pixels from source are darkened more, if both source and foregroundSource pixels are light the result is light. \row \o colorDodge - \o The lighter pixels from backgroundSource are lightened more, if both backgroundSource and foregroundSource pixels are dark the result is dark. + \o The lighter pixels from source are lightened more, if both source and foregroundSource pixels are dark the result is dark. \row \o darken - \o The darker pixel component value from backgroundSource and foregroundSource is written. + \o The darker pixel component value from source and foregroundSource is written. \row \o darkerColor - \o The lower luminance pixel rgb-value from backgroundSource and foregroundSource is written. + \o The lower luminance pixel rgb-value from source and foregroundSource is written. \row \o difference - \o The absolute pixel component value difference between backgroundSource and foregroundSource is written. + \o The absolute pixel component value difference between source and foregroundSource is written. \row \o divide - \o The pixel component values from backgroundSource is divided by the value from foregroundSource and written. + \o The pixel component values from source is divided by the value from foregroundSource and written. \row \o exclusion - \o The pixel component value difference with reduced contrast between backgroundSource and foregroundSource is written. + \o The pixel component value difference with reduced contrast between source and foregroundSource is written. \row \o hardLight - \o The pixel component values from backgroundSource are lightened or darkened according to foregroundSource values and written. + \o The pixel component values from source are lightened or darkened according to foregroundSource values and written. \row \o hue - \o The hue value from foregroundSource is combined with saturation and lightness from backgroundSource and written. + \o The hue value from foregroundSource is combined with saturation and lightness from source and written. \row \o lighten - \o The lightest pixel component value from backgroundSource and foregroundSource is written. + \o The lightest pixel component value from source and foregroundSource is written. \row \o lighterColor - \o The higher luminance pixel rgb-value from backgroundSource and foregroundSource is written. + \o The higher luminance pixel rgb-value from source and foregroundSource is written. \row \o lightness - \o The lightness value from foregroundSource is combined with hue and saturation from backgroundSource and written. + \o The lightness value from foregroundSource is combined with hue and saturation from source and written. \row \o multiply - \o The pixel component values from backgroundSource and foregroundSource are multiplied together and written. + \o The pixel component values from source and foregroundSource are multiplied together and written. \row \o negation - \o The inverted absolute pixel component value difference between backgroundSource and foregroundSource is written. + \o The inverted absolute pixel component value difference between source and foregroundSource is written. \row \o saturation - \o The saturation value from foregroundSource is combined with hue and lightness from backgroundSource and written. + \o The saturation value from foregroundSource is combined with hue and lightness from source and written. \row \o screen - \o The pixel values from backgroundSource and foregroundSource are negated, then multiplied, negated again, and written. + \o The pixel values from source and foregroundSource are negated, then multiplied, negated again, and written. \row \o subtract - \o Pixel value from foregroundSource is subracted from backgroundSource and written. + \o Pixel value from foregroundSource is subracted from source and written. \row \o softLight - \o The pixel component values from backgroundSource are lightened or darkened slightly according to foregroundSource values and written. + \o The pixel component values from source are lightened or darkened slightly according to foregroundSource values and written. \endtable \table \header - \o Example backgroundSource + \o Example source \o Example foregroundSource \row \o \image Original_bug.png diff --git a/doc/src/snippets/Blend-example.qml b/doc/src/snippets/Blend-example.qml index 038da42..b135f6f 100644 --- a/doc/src/snippets/Blend-example.qml +++ b/doc/src/snippets/Blend-example.qml @@ -66,7 +66,7 @@ Item { Blend { anchors.fill: bug - backgroundSource: bug + source: bug foregroundSource: butterfly mode: "subtract" } diff --git a/src/effects/Blend.qml b/src/effects/Blend.qml index aaa8c71..3e1656d 100644 --- a/src/effects/Blend.qml +++ b/src/effects/Blend.qml @@ -43,14 +43,14 @@ import "internal" Item { id: rootItem - property variant backgroundSource + property variant source property variant foregroundSource property string mode: "normal" property bool cached: false SourceProxy { id: backgroundSourceProxy - input: rootItem.backgroundSource + input: rootItem.source } SourceProxy { diff --git a/tests/auto/tst_qtgraphicaleffects.cpp b/tests/auto/tst_qtgraphicaleffects.cpp index bb972d5..5835876 100644 --- a/tests/auto/tst_qtgraphicaleffects.cpp +++ b/tests/auto/tst_qtgraphicaleffects.cpp @@ -523,7 +523,7 @@ void tst_qtgraphicaleffects::blend() QString componentStr = "import QtQuick 2.0\n" "import QtGraphicalEffects 1.0\n" "Blend {" - "backgroundSource: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}" + "source: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}" "foregroundSource: ShaderEffectSource {sourceItem: Rectangle {width: 100; height: 100}}" "width: 50; height: 50\n" "}"; @@ -534,7 +534,7 @@ void tst_qtgraphicaleffects::blend() QVERIFY(obj != 0); // Default values - QCOMPARE(obj->property("backgroundSource").toInt(), 0); + QCOMPARE(obj->property("source").toInt(), 0); QCOMPARE(obj->property("foregroundSource").toInt(), 0); QCOMPARE(obj->property("cached").toBool(), false); QCOMPARE(obj->property("mode").toString(), QString("normal")); diff --git a/tests/manual/testbed/TestBlend.qml b/tests/manual/testbed/TestBlend.qml index bf65164..d2d533a 100644 --- a/tests/manual/testbed/TestBlend.qml +++ b/tests/manual/testbed/TestBlend.qml @@ -57,7 +57,7 @@ TestCaseTemplate { anchors.fill: imageSource1 visible: enabledCheckBox.selected cached: cachedCheckBox.selected - backgroundSource: imageSource1 + source: imageSource1 foregroundSource: imageSource2 mode: blendMode.value } diff --git a/tools/pngdumper/ItemModel.qml b/tools/pngdumper/ItemModel.qml index 13b3eac..1ada514 100644 --- a/tools/pngdumper/ItemModel.qml +++ b/tools/pngdumper/ItemModel.qml @@ -45,7 +45,7 @@ VisualItemModel { Blend { width: size height: size - backgroundSource: bug + source: bug foregroundSource: butterfly mode: "normal" property string __name: "Blend" |