on xenial help sign in
fix expectation
commit6f38c4966597878f016efd23009c45806cb7b7a2 authorAlbert Astals <albert.astals@canonical.com> dateThu 7 Aug 2014, 11:31 (12 years ago) parent8be3e43
1 file changed+3−2
tests/plugins/Dash/cardcreator/5.res+3−2
tests/plugins/Dash/cardcreator/5.res+3−2
@@ -69,7 +69,7 @@ Loader {
6969 sourceComponent: ShaderEffect {
7070 id: overlay;
7171 height: (fixedHeaderHeight > 0 ? fixedHeaderHeight : headerHeight) + units.gu(2);
72− opacity: 0.6;
72+ property color overlayColor: cardData && cardData["overlayColor"] || "#99000000";
7373 property var source: ShaderEffectSource {
7474 id: shaderSource;
7575 sourceItem: artShapeLoader.item;
@@ -90,9 +90,10 @@ Loader {
9090 varying highp vec2 coord;
9191 uniform sampler2D source;
9292 uniform lowp float qt_Opacity;
93+ uniform highp vec4 overlayColor;
9394 void main() {
9495 lowp vec4 tex = texture2D(source, coord);
95− gl_FragColor = vec4(0, 0, 0, tex.a) * qt_Opacity;
96+ gl_FragColor = vec4(overlayColor.r, overlayColor.g, overlayColor.b, 1) * qt_Opacity * overlayColor.a * tex.a;
9697 }";
9798 }
9899 }