Fix text opacity issue

The renderer opacity value should be restored when the text opacity value is not zero.

Change-Id: Iff61b7e5665b3d083278d34fcb7701089cd48c91

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
index db4f6bd..d5019bd 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp
@@ -1158,6 +1158,15 @@ int UtcDaliToolkitTextLabelColorComponents(void)
 
   DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), false, TEST_LOCATION ); // Rendering should be skipped
 
 
   DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), false, TEST_LOCATION ); // Rendering should be skipped
 

+  label.SetProperty( TextLabel::Property::TEXT_COLOR, Color::RED );
+
+  drawTrace.Reset();
+
+  application.SendNotification();
+  application.Render();
+
+  DALI_TEST_EQUALS( drawTrace.FindMethod( "DrawArrays" ), true, TEST_LOCATION ); // Should be rendered again
+

   END_TEST;
 }
 
   END_TEST;
 }
 

diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp
index c6309f1..b8edc7a 100755 (executable)
--- a/dali-toolkit/internal/visuals/text/text-visual.cpp
+++ b/dali-toolkit/internal/visuals/text/text-visual.cpp
@@ -305,6 +305,10 @@ void OpacityConstraint( float& current, const PropertyInputContainer& inputs )
   {
     current = 0.0f;
   }
   {
     current = 0.0f;
   }

+  else
+  {
+    current = 1.0f;
+  }

 }
 
 } // unnamed namespace
 }
 
 } // unnamed namespace