Fix opacity issue when we use corner radius

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / graphics / shaders / color-visual-rounded-corner-shader.frag

diff --git a/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.frag b/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.frag
index d68e66f..4654ab4 100644 (file)
--- a/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.frag
+++ b/dali-toolkit/internal/graphics/shaders/color-visual-rounded-corner-shader.frag
@@ -7,7 +7,19 @@ uniform lowp vec3 mixColor;
 
 void main()
 {
-  mediump float dist = length( max( abs( vPosition ), vRectSize ) - vRectSize ) - vCornerRadius;
   OUT_COLOR = vec4(mixColor, 1.0) * uColor;
-  OUT_COLOR.a *= 1.0 - smoothstep( -1.0, 1.0, dist );
-}
\ No newline at end of file
+  mediump vec2 diff = abs( vPosition ) - vRectSize;
+  mediump float dist = length( max( diff, vec2( 0.0 ) ) ) - vCornerRadius;
+  if( dist > 1.0 )
+  {
+    OUT_COLOR.a = 0.0;
+  }
+  else if( dist > -1.0 )
+  {
+    if( min( diff.x, diff.y ) < 0.0)
+    {
+      dist += min( diff.x, diff.y ) / vCornerRadius;
+    }
+    OUT_COLOR.a *= 1.0 - smoothstep( -1.0, 1.0, dist );
+  }
+}