summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMarko Niemelä <marko.a.niemela@nokia.com>2011-12-29 11:42:24 +0200
committerMarko Niemelä <marko.a.niemela@nokia.com>2011-12-29 11:42:24 +0200
commit9d86dca43b8615b0fe50a3256f21e10d117586f0 (patch)
tree6fae6d0978fc5dca5aafb3301db98b679d635419 /doc
parent5396241435d4206ea2993564ae3a855a77796815 (diff)
downloadqtgraphicaleffects-9d86dca43b8615b0fe50a3256f21e10d117586f0.tar.gz
Added new blend modes to Blend effect
Diffstat (limited to 'doc')
-rw-r--r--doc/src/images/Blend_mode10.pngbin0 -> 145578 bytes
-rw-r--r--doc/src/images/Blend_mode11.pngbin0 -> 148982 bytes
-rw-r--r--doc/src/images/Blend_mode12.pngbin0 -> 145855 bytes
-rw-r--r--doc/src/images/Blend_mode13.pngbin0 -> 147901 bytes
-rw-r--r--doc/src/images/Blend_mode14.pngbin0 -> 148626 bytes
-rw-r--r--doc/src/images/Blend_mode15.pngbin0 -> 145787 bytes
-rw-r--r--doc/src/images/Blend_mode16.pngbin0 -> 152469 bytes
-rw-r--r--doc/src/images/Blend_mode17.pngbin0 -> 152450 bytes
-rw-r--r--doc/src/images/Blend_mode18.pngbin0 -> 144022 bytes
-rw-r--r--doc/src/images/Blend_mode19.pngbin0 -> 149328 bytes
-rw-r--r--doc/src/images/Blend_mode20.pngbin0 -> 149488 bytes
-rw-r--r--doc/src/images/Blend_mode21.pngbin0 -> 145464 bytes
-rw-r--r--doc/src/images/Blend_mode22.pngbin0 -> 149514 bytes
-rw-r--r--doc/src/images/Blend_mode3.pngbin144323 -> 147745 bytes
-rw-r--r--doc/src/images/Blend_mode4.pngbin152549 -> 148132 bytes
-rw-r--r--doc/src/images/Blend_mode5.pngbin145578 -> 139048 bytes
-rw-r--r--doc/src/images/Blend_mode6.pngbin148626 -> 149569 bytes
-rw-r--r--doc/src/images/Blend_mode7.pngbin144022 -> 144323 bytes
-rw-r--r--doc/src/images/Blend_mode8.pngbin149488 -> 144640 bytes
-rw-r--r--doc/src/images/Blend_mode9.pngbin145464 -> 152549 bytes
-rw-r--r--doc/src/qtgraphicaleffects-blend.qdoc94
-rw-r--r--doc/src/snippets/Blend-example.qml2
22 files changed, 87 insertions, 9 deletions
diff --git a/doc/src/images/Blend_mode10.png b/doc/src/images/Blend_mode10.png
new file mode 100644
index 0000000..282725b
--- /dev/null
+++ b/doc/src/images/Blend_mode10.png
Binary files differ
diff --git a/doc/src/images/Blend_mode11.png b/doc/src/images/Blend_mode11.png
new file mode 100644
index 0000000..e4e0db6
--- /dev/null
+++ b/doc/src/images/Blend_mode11.png
Binary files differ
diff --git a/doc/src/images/Blend_mode12.png b/doc/src/images/Blend_mode12.png
new file mode 100644
index 0000000..0f9c98a
--- /dev/null
+++ b/doc/src/images/Blend_mode12.png
Binary files differ
diff --git a/doc/src/images/Blend_mode13.png b/doc/src/images/Blend_mode13.png
new file mode 100644
index 0000000..ac2567c
--- /dev/null
+++ b/doc/src/images/Blend_mode13.png
Binary files differ
diff --git a/doc/src/images/Blend_mode14.png b/doc/src/images/Blend_mode14.png
new file mode 100644
index 0000000..cea329b
--- /dev/null
+++ b/doc/src/images/Blend_mode14.png
Binary files differ
diff --git a/doc/src/images/Blend_mode15.png b/doc/src/images/Blend_mode15.png
new file mode 100644
index 0000000..5c7bc40
--- /dev/null
+++ b/doc/src/images/Blend_mode15.png
Binary files differ
diff --git a/doc/src/images/Blend_mode16.png b/doc/src/images/Blend_mode16.png
new file mode 100644
index 0000000..cda82c1
--- /dev/null
+++ b/doc/src/images/Blend_mode16.png
Binary files differ
diff --git a/doc/src/images/Blend_mode17.png b/doc/src/images/Blend_mode17.png
new file mode 100644
index 0000000..7dfa8d8
--- /dev/null
+++ b/doc/src/images/Blend_mode17.png
Binary files differ
diff --git a/doc/src/images/Blend_mode18.png b/doc/src/images/Blend_mode18.png
new file mode 100644
index 0000000..25cd7b0
--- /dev/null
+++ b/doc/src/images/Blend_mode18.png
Binary files differ
diff --git a/doc/src/images/Blend_mode19.png b/doc/src/images/Blend_mode19.png
new file mode 100644
index 0000000..f9565cc
--- /dev/null
+++ b/doc/src/images/Blend_mode19.png
Binary files differ
diff --git a/doc/src/images/Blend_mode20.png b/doc/src/images/Blend_mode20.png
new file mode 100644
index 0000000..80cb192
--- /dev/null
+++ b/doc/src/images/Blend_mode20.png
Binary files differ
diff --git a/doc/src/images/Blend_mode21.png b/doc/src/images/Blend_mode21.png
new file mode 100644
index 0000000..be97d63
--- /dev/null
+++ b/doc/src/images/Blend_mode21.png
Binary files differ
diff --git a/doc/src/images/Blend_mode22.png b/doc/src/images/Blend_mode22.png
new file mode 100644
index 0000000..a5d0280
--- /dev/null
+++ b/doc/src/images/Blend_mode22.png
Binary files differ
diff --git a/doc/src/images/Blend_mode3.png b/doc/src/images/Blend_mode3.png
index 11b0b55..cd14337 100644
--- a/doc/src/images/Blend_mode3.png
+++ b/doc/src/images/Blend_mode3.png
Binary files differ
diff --git a/doc/src/images/Blend_mode4.png b/doc/src/images/Blend_mode4.png
index ed1aba9..509b372 100644
--- a/doc/src/images/Blend_mode4.png
+++ b/doc/src/images/Blend_mode4.png
Binary files differ
diff --git a/doc/src/images/Blend_mode5.png b/doc/src/images/Blend_mode5.png
index 282725b..8f557c0 100644
--- a/doc/src/images/Blend_mode5.png
+++ b/doc/src/images/Blend_mode5.png
Binary files differ
diff --git a/doc/src/images/Blend_mode6.png b/doc/src/images/Blend_mode6.png
index cea329b..de85ea6 100644
--- a/doc/src/images/Blend_mode6.png
+++ b/doc/src/images/Blend_mode6.png
Binary files differ
diff --git a/doc/src/images/Blend_mode7.png b/doc/src/images/Blend_mode7.png
index 25cd7b0..11b0b55 100644
--- a/doc/src/images/Blend_mode7.png
+++ b/doc/src/images/Blend_mode7.png
Binary files differ
diff --git a/doc/src/images/Blend_mode8.png b/doc/src/images/Blend_mode8.png
index 80cb192..7376f44 100644
--- a/doc/src/images/Blend_mode8.png
+++ b/doc/src/images/Blend_mode8.png
Binary files differ
diff --git a/doc/src/images/Blend_mode9.png b/doc/src/images/Blend_mode9.png
index be97d63..ed1aba9 100644
--- a/doc/src/images/Blend_mode9.png
+++ b/doc/src/images/Blend_mode9.png
Binary files differ
diff --git a/doc/src/qtgraphicaleffects-blend.qdoc b/doc/src/qtgraphicaleffects-blend.qdoc
index 48a1823..f383696 100644
--- a/doc/src/qtgraphicaleffects-blend.qdoc
+++ b/doc/src/qtgraphicaleffects-blend.qdoc
@@ -95,7 +95,8 @@
/*!
\qmlproperty string QtGraphicalEffects::Blend::mode
- This property defines the mode which is used when foregroundSource is blended over backgroundSource.
+ This property defines the mode which is used when foregroundSource is blended over backgroundSource. Values are
+ case insensitive.
\table
\header
@@ -108,8 +109,23 @@
\o addition
\o The pixel component values from backgroundSource and foregroundSource are added together and written.
\row
+ \o average
+ \o The pixel component values from backgroundSource 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.
+ \row
+ \o colorBurn
+ \o The darker pixels from backgroundSource are darkened more, if both backgroundSource 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.
+ \row
\o darken
- \o The darkest pixel component value from backgroundSource and foregroundSource is written.
+ \o The darker pixel component value from backgroundSource and foregroundSource is written.
+ \row
+ \o darkerColor
+ \o The lower luminance pixel rgb-value from backgroundSource and foregroundSource is written.
\row
\o difference
\o The absolute pixel component value difference between backgroundSource and foregroundSource is written.
@@ -117,17 +133,42 @@
\o divide
\o The pixel component values from backgroundSource is divided by the value from foregroundSource and written.
\row
- \o multiply
- \o The pixel component values from backgroundSource and foregroundSource are multiplied together and written.
+ \o exclusion
+ \o The pixel component value difference with reduced contrast between backgroundSource and foregroundSource is written.
+ \row
+ \o hardLight
+ \o The pixel component values from backgroundSource 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.
\row
\o lighten
\o The lightest pixel component value from backgroundSource and foregroundSource is written.
\row
+ \o lighterColor
+ \o The higher luminance pixel rgb-value from backgroundSource and foregroundSource is written.
+ \row
+ \o lightness
+ \o The lightness value from foregroundSource is combined with hue and saturation from backgroundSource and written.
+ \row
+ \o multiply
+ \o The pixel component values from backgroundSource and foregroundSource are multiplied together and written.
+ \row
+ \o negation
+ \o The inverted absolute pixel component value difference between backgroundSource and foregroundSource is written.
+ \row
+ \o saturation
+ \o The saturation value from foregroundSource is combined with hue and lightness from backgroundSource and written.
+ \row
\o screen
\o The pixel values from backgroundSource and foregroundSource are negated, then multiplied, negated again, and written.
\row
\o subtract
\o Pixel value from foregroundSource is subracted from backgroundSource and written.
+ \row
+ \o softLight
+ \o The pixel component values from backgroundSource are lightened or darkened slightly according to foregroundSource values and written.
+
\endtable
\table
@@ -151,25 +192,62 @@
\row
\o \bold { mode: normal }
\o \bold { mode: addition }
- \o \bold { mode: darken }
+ \o \bold { mode: average }
\row
\o \image Blend_mode4.png
\o \image Blend_mode5.png
\o \image Blend_mode6.png
\row
- \o \bold { mode: difference }
- \o \bold { mode: divide }
- \o \bold { mode: lighten }
+ \o \bold { mode: color }
+ \o \bold { mode: colorBurn }
+ \o \bold { mode: colorDodge }
\row
\o \image Blend_mode7.png
\o \image Blend_mode8.png
\o \image Blend_mode9.png
\row
+ \o \bold { mode: darken }
+ \o \bold { mode: darkerColor }
+ \o \bold { mode: difference }
+ \row
+ \o \image Blend_mode10.png
+ \o \image Blend_mode11.png
+ \o \image Blend_mode12.png
+ \row
+ \o \bold { mode: divide }
+ \o \bold { mode: exclusion }
+ \o \bold { mode: hardlight }
+ \row
+ \o \image Blend_mode13.png
+ \o \image Blend_mode14.png
+ \o \image Blend_mode15.png
+ \row
+ \o \bold { mode: hue }
+ \o \bold { mode: lighten }
+ \o \bold { mode: lighterColor }
+ \row
+ \o \image Blend_mode16.png
+ \o \image Blend_mode17.png
+ \o \image Blend_mode18.png
+ \row
+ \o \bold { mode: lightness }
+ \o \bold { mode: negation }
\o \bold { mode: multiply }
+ \row
+ \o \image Blend_mode19.png
+ \o \image Blend_mode20.png
+ \o \image Blend_mode21.png
+ \row
+ \o \bold { mode: saturation }
\o \bold { mode: screen }
\o \bold { mode: subtract }
+ \row
+ \o \image Blend_mode22.png
+ \row
+ \o \bold { mode: softLight }
\endtable
+
*/
/*!
diff --git a/doc/src/snippets/Blend-example.qml b/doc/src/snippets/Blend-example.qml
index 26da3c3..2b830ab 100644
--- a/doc/src/snippets/Blend-example.qml
+++ b/doc/src/snippets/Blend-example.qml
@@ -68,7 +68,7 @@ Item {
anchors.fill: blendSourceItem1
backgroundSource: blendSourceItem1
foregroundSource: blendSourceItem2
- mode: "screen"
+ mode: "subtract"
}
}
//! [example]