X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fbuilder%2Freplacement.cpp;h=a15ef2129de23ac50239bc76cca0fee2f963f01f;hp=07240beea013b01ee114ba839b86fbfa50bfc461;hb=0e1683ef848d1d877e26633609fa95e0d2ab36b5;hpb=f7ca0a1c753ea498df357add70b5c7a9bad4ea91 diff --git a/dali-toolkit/internal/builder/replacement.cpp b/dali-toolkit/internal/builder/replacement.cpp index 07240be..a15ef21 100644 --- a/dali-toolkit/internal/builder/replacement.cpp +++ b/dali-toolkit/internal/builder/replacement.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -429,7 +429,23 @@ OptionalRect Replacement::IsRect( const TreeNode & node ) const return ret; } - +OptionalExtents Replacement::IsExtents( const TreeNode & node ) const +{ + OptionalExtents extents; + if( OptionalString replace = HasFullReplacement( node ) ) + { + Property::Value value = GetFullReplacement( *replace ); + if( Property::EXTENTS == value.GetType() ) + { + extents = value.Get(); + } + } + else + { + extents = ::IsExtents( node ); + } + return extents; +} OptionalFloat Replacement::IsFloat( OptionalChild child ) const { @@ -578,6 +594,18 @@ bool Replacement::IsArray( OptionalChild child, Property::Value& out ) const return ret; } +OptionalExtents Replacement::IsExtents( OptionalChild child ) const +{ + if( child ) + { + return IsExtents( *child ); + } + else + { + return OptionalExtents(); + } +} + } // namespace Internal } // namespace Toolkit