projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "propagate unhandled key( DALI_KEY_SEARCH )" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
visual-factory
/
visual-base.cpp
diff --git
a/dali-toolkit/devel-api/visual-factory/visual-base.cpp
b/dali-toolkit/devel-api/visual-factory/visual-base.cpp
index
0c39ff5
..
b6a51fb
100644
(file)
--- 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) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-51,48
+51,44
@@
Visual::Base::Base(Internal::Visual::Base *impl)
{
}
{
}
-void Visual::Base::Set
Size( const Vector2& siz
e )
+void Visual::Base::Set
Name( const std::string& nam
e )
{
{
- GetImplementation( *this ).Set
Size( siz
e );
+ GetImplementation( *this ).Set
Name( nam
e );
}
}
-const
Vector2& Visual::Base::GetSize() const
+const
std::string& Visual::Base::GetName()
{
{
- return GetImplementation( *this ).Get
Siz
e();
+ return GetImplementation( *this ).Get
Nam
e();
}
}
-void Visual::Base::
GetNaturalSize(Vector2& naturalSize ) const
+void Visual::Base::
SetTransformAndSize( const Property::Map& transform, Size controlSize )
{
{
- GetImplementation( *this ).
GetNaturalSize( natura
lSize );
+ GetImplementation( *this ).
SetTransformAndSize( transform, contro
lSize );
}
}
-
void Visual::Base::SetDepthIndex( float index
)
+
float Visual::Base::GetHeightForWidth( float width
)
{
{
-
GetImplementation( *this ).SetDepthIndex( index
);
+
return GetImplementation( *this ).GetHeightForWidth( width
);
}
}
-float Visual::Base::Get
DepthIndex() const
+float Visual::Base::Get
WidthForHeight( float height )
{
{
- return GetImplementation( *this ).Get
DepthIndex(
);
+ return GetImplementation( *this ).Get
WidthForHeight( height
);
}
}
-void Visual::Base::
SetOnStage( Actor& actor
)
+void Visual::Base::
GetNaturalSize(Vector2& naturalSize
)
{
{
- GetImplementation( *this ).
SetOnStage( actor
);
+ GetImplementation( *this ).
GetNaturalSize( naturalSize
);
}
}
-void Visual::Base::Set
OffStage( Actor& actor
)
+void Visual::Base::Set
DepthIndex( int index
)
{
{
- GetImplementation( *this ).Set
OffStage( actor
);
+ GetImplementation( *this ).Set
DepthIndex( index
);
}
}
-void Visual::Base::RemoveAndReset( Actor& actor )
+int Visual::Base::GetDepthIndex() const
{
{
- if( actor && *this )
- {
- SetOffStage( actor );
- }
- Reset();
+ return GetImplementation( *this ).GetDepthIndex();
}
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
}
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
@@
-100,15
+96,8
@@
void Visual::Base::CreatePropertyMap( Property::Map& map ) const
GetImplementation( *this ).CreatePropertyMap( map );
}
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
} // namespace Toolkit