[Tizen] Updated L8 text shader to account for actor alpha 80/142580/1 accepted/tizen/unified/20170809.015316 submit/tizen/20170804.104325 submit/tizen/20170804.104701
authorDavid Steele <david.steele@samsung.com>
Mon, 31 Jul 2017 19:53:57 +0000 (20:53 +0100)
committerminho.sun <minho.sun@samsung.com>
Fri, 4 Aug 2017 10:29:01 +0000 (19:29 +0900)
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 <david.steele@samsung.com>
dali-toolkit/internal/text/rendering/atlas/text-atlas-renderer.cpp

index c3663dd..e9b876d 100644 (file)
@@ -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 );
 }
 );