From eae234c632fe038b114d65c22766bc3069cf8cfe Mon Sep 17 00:00:00 2001 From: David Steele Date: Mon, 31 Jul 2017 20:53:57 +0100 Subject: [PATCH] Updated L8 text shader to account for actor alpha Fading demos such as popup and contact view were showing text too early / too late. This patch fixes these demos. Change-Id: I54aa32311ca27f9169f7b196d45a111ef0965f95 Signed-off-by: David Steele --- dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp index c3663dd..e9b876d 100644 --- a/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp +++ b/dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp @@ -73,7 +73,7 @@ varying mediump vec4 vColor; void main() { mediump vec4 color = texture2D( sTexture, vTexCoord ); - gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, vColor.a * textColorAnimatable.a * color.r ); + gl_FragColor = vec4( vColor.rgb * uColor.rgb * textColorAnimatable.rgb, uColor.a * vColor.a * textColorAnimatable.a * color.r ); } ); -- 2.7.4