From cdac11c27bab99068abd2ecabb1c54645b2f90a9 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 18 Jul 2018 10:18:54 +0900 Subject: [PATCH] Fix text opacity issue The renderer opacity value should be restored when the text opacity value is not zero. Change-Id: Iff61b7e5665b3d083278d34fcb7701089cd48c91 --- automated-tests/src/dali-toolkit/utc-Dali-TextLabel.cpp | 9 +++++++++ dali-toolkit/internal/visuals/text/text-visual.cpp | 4 ++++ 2 files changed, 13 insertions(+) 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 --- 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 + 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; } diff --git a/dali-toolkit/internal/visuals/text/text-visual.cpp b/dali-toolkit/internal/visuals/text/text-visual.cpp index c6309f1..b8edc7a 100755 --- 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; } + else + { + current = 1.0f; + } } } // unnamed namespace -- 2.7.4