X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-base.cpp;h=b6a51fb3a6ab97823f5d74b2f2fef8b28803d7cc;hb=8b9e1eb2a98b0cbfb30286e097fc03e9c5e6410d;hp=c5b822d86f67901fb6b946297f11648a6f8d4b4d;hpb=ccd53048e482f41b00ad1daa7664b3781d6b7626;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/visual-factory/visual-base.cpp b/dali-toolkit/devel-api/visual-factory/visual-base.cpp index c5b822d..b6a51fb 100644 --- a/dali-toolkit/devel-api/visual-factory/visual-base.cpp +++ b/dali-toolkit/devel-api/visual-factory/visual-base.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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. @@ -61,19 +61,19 @@ const std::string& Visual::Base::GetName() return GetImplementation( *this ).GetName(); } -void Visual::Base::SetSize( const Vector2& size ) +void Visual::Base::SetTransformAndSize( const Property::Map& transform, Size controlSize ) { - GetImplementation( *this ).SetSize( size ); + GetImplementation( *this ).SetTransformAndSize( transform, controlSize ); } -const Vector2& Visual::Base::GetSize() const +float Visual::Base::GetHeightForWidth( float width ) { - return GetImplementation( *this ).GetSize(); + return GetImplementation( *this ).GetHeightForWidth( width ); } -float Visual::Base::GetHeightForWidth( float width ) const +float Visual::Base::GetWidthForHeight( float height ) { - return GetImplementation( *this ).GetHeightForWidth( width ); + return GetImplementation( *this ).GetWidthForHeight( height ); } void Visual::Base::GetNaturalSize(Vector2& naturalSize ) @@ -81,12 +81,12 @@ void Visual::Base::GetNaturalSize(Vector2& naturalSize ) GetImplementation( *this ).GetNaturalSize( naturalSize ); } -void Visual::Base::SetDepthIndex( float index ) +void Visual::Base::SetDepthIndex( int index ) { GetImplementation( *this ).SetDepthIndex( index ); } -float Visual::Base::GetDepthIndex() const +int Visual::Base::GetDepthIndex() const { return GetImplementation( *this ).GetDepthIndex(); } @@ -96,15 +96,8 @@ void Visual::Base::CreatePropertyMap( Property::Map& map ) const GetImplementation( *this ).CreatePropertyMap( map ); } -void Visual::Base::SetProperty( Dali::Property::Index index, const Dali::Property::Value& propertyValue ) -{ - GetImplementation( *this ).SetProperty( index, propertyValue ); -} -Dali::Property::Value Visual::Base::GetProperty( Dali::Property::Index index ) -{ - return GetImplementation( *this ).GetProperty( index ); -} + } // namespace Toolkit