diff options
author | Nico Vertriest <nico.vertriest@digia.com> | 2015-06-04 12:41:56 +0200 |
---|---|---|
committer | Nico Vertriest <nico.vertriest@digia.com> | 2015-06-25 10:58:58 +0000 |
commit | c3d26e75b0a9cc9848ebe316ee88b29655a6564f (patch) | |
tree | 8f23a2a85dfc76e046b04783307f602553f27eb4 /src/quick/items/qquickshadereffect.cpp | |
parent | 3e5a89ae70eb612afef0d593f180a57da17c782f (diff) |
Doc: resize tables with overflow
Task-number: QTBUG-46475
Change-Id: Iebb2f7677f8b514d2b3e08480abfc98a0e155c1c
Reviewed-by: Venugopal Shivashankar <venugopal.shivashankar@digia.com>
Diffstat (limited to 'src/quick/items/qquickshadereffect.cpp')
-rw-r--r-- | src/quick/items/qquickshadereffect.cpp | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/quick/items/qquickshadereffect.cpp b/src/quick/items/qquickshadereffect.cpp index 5903052dbd..0be305b693 100644 --- a/src/quick/items/qquickshadereffect.cpp +++ b/src/quick/items/qquickshadereffect.cpp @@ -601,7 +601,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, \l blending is enabled, source-over blending is used. However, additive blending can be achieved by outputting zero in the alpha channel. - \table + \table 70% \row \li \image declarative-shadereffectitem.png \li \qml @@ -610,7 +610,8 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, Rectangle { width: 200; height: 100 Row { - Image { id: img; sourceSize { width: 100; height: 100 } source: "qt-logo.png" } + Image { id: img; + sourceSize { width: 100; height: 100 } source: "qt-logo.png" } ShaderEffect { width: 100; height: 100 property variant src: img @@ -629,7 +630,9 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, uniform lowp float qt_Opacity; void main() { lowp vec4 tex = texture2D(src, coord); - gl_FragColor = vec4(vec3(dot(tex.rgb, vec3(0.344, 0.5, 0.156))), tex.a) * qt_Opacity; + gl_FragColor = vec4(vec3(dot(tex.rgb, + vec3(0.344, 0.5, 0.156))), + tex.a) * qt_Opacity; }" } } @@ -649,6 +652,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, \row \li \b {Layer with effect disabled} \inlineimage qml-shadereffect-nolayereffect.png \li \b {Layer with effect enabled} \inlineimage qml-shadereffect-layereffect.png + \row \li \snippet qml/layerwitheffect.qml 1 \endtable @@ -657,6 +661,7 @@ void QQuickShaderEffectCommon::propertyChanged(QQuickItem *item, int mappedId, \table \row \li \inlineimage qml-shadereffect-opacitymask.png + \row \li \snippet qml/opacitymask.qml 1 \endtable |