X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-factory-impl.h;h=4a4ab4c978ae32edbdc536daa05604b86c1ae968;hb=078278a2ea58db1f07114513bf21783eb689f63a;hp=0e4dcb4bd2bed6ef5bd822d12004d7ba1eed2c5c;hpb=66adf16a82bd15f4472d951b5e8a96ae297bbe41;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-factory-impl.h b/dali-toolkit/internal/visuals/visual-factory-impl.h index 0e4dcb4..4a4ab4c 100644 --- a/dali-toolkit/internal/visuals/visual-factory-impl.h +++ b/dali-toolkit/internal/visuals/visual-factory-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_VISUAL_FACTORY_IMPL_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -67,11 +67,6 @@ public: Toolkit::Visual::Base CreateVisual( const Property::Map& propertyMap ); /** - * @copydoc Toolkit::VisualFactory::CreateVisual( const Image& ) - */ - Toolkit::Visual::Base CreateVisual( const Image& image ); - - /** * @copydoc Toolkit::VisualFactory::CreateVisual( const std::string&, ImageDimensions ) */ Toolkit::Visual::Base CreateVisual( const std::string& image, ImageDimensions size ); @@ -140,7 +135,7 @@ void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterTyp Toolkit::GetImplementation(visual).SetOffStage( actor ); } visual = Toolkit::VisualFactory::Get().CreateVisual( param0, param1 ); - if( visual && actor && actor.OnStage() ) + if( visual && actor && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { Toolkit::GetImplementation(visual).SetOnStage(actor); } @@ -163,7 +158,7 @@ void InitializeVisual( Actor& actor, Toolkit::Visual::Base& visual, ParameterTyp Toolkit::GetImplementation(visual).SetOffStage( actor ); } visual = Toolkit::VisualFactory::Get().CreateVisual( param ); - if( visual && actor && actor.OnStage() ) + if( visual && actor && actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) ) { Toolkit::GetImplementation(visual).SetOnStage(actor); }