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 "DALi C# binding - Avoid removal of dali-swig/manual/cpp/keyboard_focus_manager...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.h
b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index
fb8ae32
..
f8ceabf
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-24,6
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
+#include <dali-toolkit/devel-api/align-enums.h>
namespace Dali
{
namespace Dali
{
@@
-60,14
+61,27
@@
struct Base::Impl
void CreatePropertyMap( Property::Map& map ) const;
};
void CreatePropertyMap( Property::Map& map ) const;
};
- Renderer mRenderer;
+ struct Transform
+ {
+ Vector2 mOffset;
+ Vector2 mSize;
+ Vector4 mOffsetSizeMode;
+ Toolkit::Align::Type mOrigin;
+ Toolkit::Align::Type mAnchorPoint;
- CustomShader* mCustomShader;
+ Transform();
+ void SetPropertyMap( const Property::Map& map );
+ void GetPropertyMap( Property::Map& map ) const;
+ void RegisterUniforms( Renderer renderer, Toolkit::Direction::Type direction );
+ };
- Vector2 mSize;
- Vector2 mOffset;
- float mDepthIndex;
- int mFlags;
+ Renderer mRenderer;
+ CustomShader* mCustomShader;
+ std::string mName;
+ Transform mTransform;
+ Vector2 mSize;
+ float mDepthIndex;
+ int mFlags;
Impl();
~Impl();
Impl();
~Impl();