X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;fp=optional%2Fdali-toolkit%2Finternal%2Fbuilder%2Fbuilder-impl.cpp;h=edba3660c5f6db728058cd6a3f3a2d717e82600b;hp=ae6e036f9a99ccd7ca2d7383e4ee73226dc3d5f2;hb=022b76df6f53c2860f2684ef1ffee81af1805e2e;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc diff --git a/optional/dali-toolkit/internal/builder/builder-impl.cpp b/base/dali-toolkit/internal/builder/builder-impl.cpp similarity index 99% rename from optional/dali-toolkit/internal/builder/builder-impl.cpp rename to base/dali-toolkit/internal/builder/builder-impl.cpp index ae6e036..edba366 100644 --- a/optional/dali-toolkit/internal/builder/builder-impl.cpp +++ b/base/dali-toolkit/internal/builder/builder-impl.cpp @@ -994,13 +994,13 @@ void Builder::LoadConstants( const TreeNode& root, PropertyValueMap& intoMap ) } -void Builder::ApplyStyle( const std::string& styleName, Handle& handle ) +bool Builder::ApplyStyle( const std::string& styleName, Handle& handle ) { Replacement replacer( mReplacementMap ); - ApplyStyle( styleName, handle, replacer ); + return ApplyStyle( styleName, handle, replacer ); } -void Builder::ApplyStyle( const std::string& styleName, Handle& handle, const Replacement& replacement ) +bool Builder::ApplyStyle( const std::string& styleName, Handle& handle, const Replacement& replacement ) { DALI_ASSERT_ALWAYS(mParser.GetRoot() && "Builder script not loaded"); @@ -1010,12 +1010,13 @@ void Builder::ApplyStyle( const std::string& styleName, Handle& handle, const Re if( styles && style ) { ApplyAllStyleProperties( *mParser.GetRoot(), *style, handle, replacement ); + return true; } else { DALI_SCRIPT_WARNING("No styles section to create style '%s'\n", styleName.c_str()); + return false; } - } BaseHandle Builder::Create( const std::string& templateName, const PropertyValueMap& map )