diff options
| author | Matthias Clasen <mclasen@redhat.com> | 2020-05-19 02:47:03 +0000 |
|---|---|---|
| committer | Matthias Clasen <mclasen@redhat.com> | 2020-05-19 02:47:03 +0000 |
| commit | 7fc2d9adc09b029de936e39bc390e7d0a01d5476 (patch) | |
| tree | de09577dfa4ca8ac9782991836187088f9fdcaa8 | |
| parent | 15f7d2a27d6af5ef16781a472547acfb2f9484a2 (diff) | |
| parent | 17dd32da883bb7cb67263d936b4d128be8b6be34 (diff) | |
| download | gtk+-7fc2d9adc09b029de936e39bc390e7d0a01d5476.tar.gz | |
Merge branch 'matthiasc/for-master' into 'master'
Matthiasc/for master
Closes #2739 and #2760
See merge request GNOME/gtk!1934
| -rw-r--r-- | gsk/gskenums.h | 33 | ||||
| -rw-r--r-- | testsuite/css/change/meson.build | 1 |
2 files changed, 19 insertions, 15 deletions
diff --git a/gsk/gskenums.h b/gsk/gskenums.h index d5fcb8ec55..d7607fbcb1 100644 --- a/gsk/gskenums.h +++ b/gsk/gskenums.h @@ -98,25 +98,30 @@ typedef enum { * @GSK_BLEND_MODE_DEFAULT: The default blend mode, which specifies no blending * @GSK_BLEND_MODE_MULTIPLY: The source color is multiplied by the destination * and replaces the destination - * @GSK_BLEND_MODE_SCREEN: ... - * @GSK_BLEND_MODE_OVERLAY: ... - * @GSK_BLEND_MODE_DARKEN: ... - * @GSK_BLEND_MODE_LIGHTEN: ... - * @GSK_BLEND_MODE_COLOR_DODGE: ... - * @GSK_BLEND_MODE_COLOR_BURN: ... - * @GSK_BLEND_MODE_HARD_LIGHT: ... - * @GSK_BLEND_MODE_SOFT_LIGHT: ... - * @GSK_BLEND_MODE_DIFFERENCE: ... - * @GSK_BLEND_MODE_EXCLUSION: ... - * @GSK_BLEND_MODE_COLOR: ... - * @GSK_BLEND_MODE_HUE: ... - * @GSK_BLEND_MODE_SATURATION: ... - * @GSK_BLEND_MODE_LUMINOSITY: ... + * @GSK_BLEND_MODE_SCREEN: Multiplies the complements of the destination and source + * color values, then complements the result. + * @GSK_BLEND_MODE_OVERLAY: Multiplies or screens the colors, depending on the + * destination color value. This is the inverse of hard-list + * @GSK_BLEND_MODE_DARKEN: Selects the darker of the destination and source colors + * @GSK_BLEND_MODE_LIGHTEN: Selects the lighter of the destination and source colors + * @GSK_BLEND_MODE_COLOR_DODGE: Brightens the destination color to reflect the source color + * @GSK_BLEND_MODE_COLOR_BURN: Darkens the destination color to reflect the source color + * @GSK_BLEND_MODE_HARD_LIGHT: Multiplies or screens the colors, depending on the source color value + * @GSK_BLEND_MODE_SOFT_LIGHT: Darkens or lightens the colors, depending on the source color value + * @GSK_BLEND_MODE_DIFFERENCE: Subtracts the darker of the two constituent colors from the lighter color + * @GSK_BLEND_MODE_EXCLUSION: Produces an effect similar to that of the difference mode but lower in contrast + * @GSK_BLEND_MODE_COLOR: Creates a color with the hue and saturation of the source color and the luminosity of the destination color + * @GSK_BLEND_MODE_HUE: Creates a color with the hue of the source color and the saturation and luminosity of the destination color + * @GSK_BLEND_MODE_SATURATION: Creates a color with the saturation of the source color and the hue and luminosity of the destination color + * @GSK_BLEND_MODE_LUMINOSITY: Creates a color with the luminosity of the source color and the hue and saturation of the destination color * * The blend modes available for render nodes. * * The implementation of each blend mode is deferred to the * rendering pipeline. + * + * See https://www.w3.org/TR/compositing-1/#blending for more information + * on blending and blend modes. */ typedef enum { GSK_BLEND_MODE_DEFAULT = 0, diff --git a/testsuite/css/change/meson.build b/testsuite/css/change/meson.build index 9de434955b..04204ed5ba 100644 --- a/testsuite/css/change/meson.build +++ b/testsuite/css/change/meson.build @@ -23,7 +23,6 @@ test_data = [ 'test2.css', 'test2.ui', 'test2.nodes', 'test3.css', 'test3.ui', 'test3.nodes', 'test4.css', 'test4.ui', 'test4.nodes', - 'test5.css', 'test5.ui', 'test5.nodes', ] if get_option('install-tests') |