X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fvisual-factory%2Fvisual-base.cpp;h=c0c6d2bb4a5e7f83301e95cdc23c8cd1f2b24639;hb=022d1f62c2805aafc0f16de9ed8349ed2cf7b8a8;hp=7a4821bfc6c685d77f264cf3e678b83b0475a9fa;hpb=84c98859f482a168f4cc5f4d84b3a08c39b8902c;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 7a4821b..c0c6d2b 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) 2018 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. @@ -56,24 +56,24 @@ void Visual::Base::SetName( const std::string& name ) GetImplementation( *this ).SetName( name ); } -const std::string& Visual::Base::GetName() +const std::string& Visual::Base::GetName() const { return GetImplementation( *this ).GetName(); } -void Visual::Base::SetSize( const Vector2& size ) +void Visual::Base::SetTransformAndSize( const Dali::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,49 +81,28 @@ 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(); } -void Visual::Base::SetOnStage( Actor& actor ) +void Visual::Base::CreatePropertyMap( Dali::Property::Map& map ) const { - GetImplementation( *this ).SetOnStage( actor ); + GetImplementation( *this ).CreatePropertyMap( map ); } -void Visual::Base::SetOffStage( Actor& actor ) +Visual::Type Visual::Base::GetType() const { - GetImplementation( *this ).SetOffStage( actor ); + return GetImplementation( *this ).GetType(); } -void Visual::Base::RemoveAndReset( Actor& actor ) -{ - if( actor && *this ) - { - SetOffStage( actor ); - } - Reset(); -} -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