X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-scroller.cpp;h=466bfa687d296b29c3421c545e42c1727c11d6dd;hp=dbc16ebb3e875d6bd493b0f2f1cf44a573384b6b;hb=c5e1d2bfc9502a23cf781773d36d4aeffbc58a7b;hpb=48d13d45cb7f363d3cf8da048ce6cef074c55060

diff --git a/dali-toolkit/internal/text/text-scroller.cpp b/dali-toolkit/internal/text/text-scroller.cpp
index dbc16eb..466bfa6 100644
--- a/dali-toolkit/internal/text/text-scroller.cpp
+++ b/dali-toolkit/internal/text/text-scroller.cpp
@@ -81,12 +81,25 @@ const char* VERTEX_SHADER_SCROLL = DALI_COMPOSE_SHADER(
 const char* FRAGMENT_SHADER = DALI_COMPOSE_SHADER(
   varying highp vec2 vTexCoord;\n
   uniform sampler2D sTexture;\n
+  uniform lowp vec4 uColor;\n
+  uniform lowp vec3 mixColor;\n
+  uniform lowp float opacity;\n
+  uniform lowp float preMultipliedAlpha;\n
+  \n
+  lowp vec4 visualMixColor()\n
+  {\n
+    return vec4( mixColor * mix( 1.0, opacity, preMultipliedAlpha ), opacity );\n
+  }\n
   \n
   void main()\n
   {\n
     if ( vTexCoord.y > 1.0 )\n
       discard;\n
-    gl_FragColor = texture2D( sTexture, vTexCoord );\n
+    \n
+    mediump vec4 textTexture = texture2D( sTexture, vTexCoord );\n
+    textTexture.rgb *= mix( 1.0, textTexture.a, preMultipliedAlpha );\n
+    \n
+    gl_FragColor = textTexture * uColor * visualMixColor();
   }\n
 );