alecs/plasma-framework
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Fading Node] Don't mix opacity separately

Browse Source 
This breaks icon item fading when its opacity is smaller than 1 as can be observed
in the "Leave" dialog.

BUG: 355894
REVIEW: 127427
This commit is contained in:
Kai Uwe Broulik 2016-03-20 11:33:07 +01:00
parent bd354ecf70
commit 92e2c07adf
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/declarativeimports/core/fadingnode.cpp
View File

@ -74,8 +74,7 @@ const char* FadingMaterialShader::fragmentShader() const
"void main() {" "void main() {"
"lowp vec4 tex1 = texture2D(u_target, v_coord);" "lowp vec4 tex1 = texture2D(u_target, v_coord);"
"lowp vec4 tex2 = texture2D(u_src, v_coord);" "lowp vec4 tex2 = texture2D(u_src, v_coord);"
"gl_FragColor.rgb = mix(tex2.rgb, tex1.rgb, u_transitionProgress);" "gl_FragColor = mix(tex2, tex1, u_transitionProgress) * qt_Opacity;"
"gl_FragColor.a = mix(tex2.a, tex1.a, u_transitionProgress) * qt_Opacity;"
"}"; "}";
} }