From: Woochan Lee Date: Thu, 22 May 2025 04:46:48 +0000 (+0900) Subject: Revert "[Tizen] Create new gradient visual only if required" X-Git-Tag: accepted/tizen/unified/20250530.090430~6 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=be30bd75d15b831214194a6e4b8bc8d539e67d8e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "[Tizen] Create new gradient visual only if required" This reverts commit 28df020d7e67b113b8ed40986dea9d7307bf8f86. --- diff --git a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp index da1d1a661d..6156c8ce06 100644 --- a/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp +++ b/dali-toolkit/internal/visuals/gradient/gradient-visual.cpp @@ -171,35 +171,32 @@ GradientVisual::~GradientVisual() void GradientVisual::DoSetProperties(const Property::Map& propertyMap) { - if(!mGradient) - { - Toolkit::GradientVisual::Units::Type gradientUnits = Toolkit::GradientVisual::Units::OBJECT_BOUNDING_BOX; + Toolkit::GradientVisual::Units::Type gradientUnits = Toolkit::GradientVisual::Units::OBJECT_BOUNDING_BOX; - Property::Value* unitsValue = propertyMap.Find(Toolkit::GradientVisual::Property::UNITS, UNITS_NAME); - if(unitsValue) - { - Scripting::GetEnumerationProperty(*unitsValue, UNITS_TABLE, UNITS_TABLE_COUNT, gradientUnits); - } + Property::Value* unitsValue = propertyMap.Find(Toolkit::GradientVisual::Property::UNITS, UNITS_NAME); + if(unitsValue) + { + Scripting::GetEnumerationProperty(*unitsValue, UNITS_TABLE, UNITS_TABLE_COUNT, gradientUnits); + } - mGradientType = Type::LINEAR; - if(propertyMap.Find(Toolkit::GradientVisual::Property::RADIUS, RADIUS_NAME)) - { - mGradientType = Type::RADIAL; - } - else if(propertyMap.Find(Toolkit::GradientVisual::Property::START_ANGLE, CONIC_START_ANGLE_NAME)) - { - mGradientType = Type::CONIC; - } + mGradientType = Type::LINEAR; + if(propertyMap.Find(Toolkit::GradientVisual::Property::RADIUS, RADIUS_NAME)) + { + mGradientType = Type::RADIAL; + } + else if(propertyMap.Find(Toolkit::GradientVisual::Property::START_ANGLE, CONIC_START_ANGLE_NAME)) + { + mGradientType = Type::CONIC; + } - if(NewGradient(mGradientType, propertyMap)) - { - mGradient->SetGradientUnits(gradientUnits); - mGradientTransform = mGradient->GetAlignmentTransform(); - } - else - { - DALI_LOG_ERROR("Fail to provide valid properties to create a GradientVisual object\n"); - } + if(NewGradient(mGradientType, propertyMap)) + { + mGradient->SetGradientUnits(gradientUnits); + mGradientTransform = mGradient->GetAlignmentTransform(); + } + else + { + DALI_LOG_ERROR("Fail to provide valid properties to create a GradientVisual object\n"); } } @@ -370,7 +367,7 @@ bool GradientVisual::NewGradient(Type gradientType, const Property::Map& propert } else // if(gradientType == Type::CONIC) { - Property::Value* centerValue = propertyMap.Find(Toolkit::GradientVisual::Property::CENTER, CENTER_NAME); + Property::Value* centerValue = propertyMap.Find(Toolkit::GradientVisual::Property::CENTER, CENTER_NAME); Property::Value* startAngleValue = propertyMap.Find(Toolkit::GradientVisual::Property::START_ANGLE, CONIC_START_ANGLE_NAME); Vector2 center; float startAngle;