X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fcheck-box-button-impl.cpp;h=e468c0e39622762cc1d712e3aeaed0015d3eefb5;hp=0aa4e830c9d94bea77e5b25159b8697e263b5f1e;hb=bd4f4c078bc02ca029fdbef266f6e7b5b79650e2;hpb=8269fc656ce5c08314e340932c2af762e7234628

diff --git a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
index 0aa4e83..e468c0e 100644
--- a/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/check-box-button-impl.cpp
@@ -40,6 +40,8 @@ namespace
 
 const float DISTANCE_BETWEEN_IMAGE_AND_LABEL( 5.0f );
 const float ANIMATION_TIME( 0.26f );  // EFL checkbox tick time
+// Required for the UV reveal shader to render the tick on top of the rest of the checkbox.
+const float SHADER_DEPTH_OFFSET = 1.0f;
 
 BaseHandle Create()
 {
@@ -92,7 +94,7 @@ void CheckBoxButton::OnButtonInitialize()
   SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR );
 }
 
-void CheckBoxButton::OnLabelSet()
+void CheckBoxButton::OnLabelSet( bool noPadding )
 {
   Actor& label = GetLabelActor();
 
@@ -166,11 +168,13 @@ void CheckBoxButton::PrepareForTranstionIn( Actor actor )
     {
       mTickUVEffect = CreateImageRegionEffect();
     }
-    mTickUVEffect.SetUniform("uBottomRight", Vector2( 0.0f, 1.0f ) );
+    mTickUVEffect.SetUniform( "uBottomRight", Vector2( 0.0f, 1.0f ) );
 
     ImageActor imageActor = ImageActor::DownCast( actor );
     if( imageActor )
     {
+      // Ensure the tick effect is rendered above the reset of the checkbox.
+      imageActor.SetSortModifier( SHADER_DEPTH_OFFSET );
       imageActor.SetShaderEffect( mTickUVEffect );
     }
   }
@@ -185,9 +189,9 @@ void CheckBoxButton::PrepareForTranstionOut( Actor actor )
 
     if( !mTickUVEffect )
     {
-        mTickUVEffect = CreateImageRegionEffect();
+      mTickUVEffect = CreateImageRegionEffect();
     }
-    mTickUVEffect.SetUniform("uBottomRight", Vector2::ONE );
+    mTickUVEffect.SetUniform( "uBottomRight", Vector2::ONE );
 
     ImageActor imageActor = ImageActor::DownCast( actor );
     if( imageActor )
@@ -223,7 +227,7 @@ void CheckBoxButton::OnTransitionIn( Actor actor )
       actor.SetScale( Vector3::ONE );
       if( mTickUVEffect )
       {
-    	mTickUVEffect.SetUniform("uBottomRight", Vector2::ONE );
+        mTickUVEffect.SetUniform( "uBottomRight", Vector2::ONE );
       }
     }
   }