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 "Garbage Collection using Dispose Queue method" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-impl.h
b/dali-toolkit/internal/visuals/visual-base-impl.h
index
432a3f2
..
cb0c7be
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-impl.h
@@
-84,12
+84,7
@@
public:
/**
* @copydoc Toolkit::Visual::Base::SetSize
*/
/**
* @copydoc Toolkit::Visual::Base::SetSize
*/
- virtual void SetSize( const Vector2& size );
-
- /**
- * @copydoc Toolkit::Visual::Base::GetSize
- */
- const Vector2& GetSize() const;
+ void SetTransformAndSize( const Property::Map& transform, Size controlSize );
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
/**
* @copydoc Toolkit::Visual::Base::GetHeightForWidth
@@
-99,7
+94,7
@@
public:
/**
* @copydoc Toolkit::Visual::Base::GetNaturalSize
*/
/**
* @copydoc Toolkit::Visual::Base::GetNaturalSize
*/
- virtual void GetNaturalSize( Vector2& naturalSize )
const
;
+ virtual void GetNaturalSize( Vector2& naturalSize );
/**
* @copydoc Toolkit::Visual::Base::SetDepthIndex
/**
* @copydoc Toolkit::Visual::Base::SetDepthIndex
@@
-186,6
+181,12
@@
protected:
*/
virtual void DoSetProperties( const Property::Map& propertyMap ) = 0;
*/
virtual void DoSetProperties( const Property::Map& propertyMap ) = 0;
+ /**
+ * @brief Called when transform or control size changes
+ * ( Of use to SVG and Text visuals )
+ */
+ virtual void OnSetTransform() = 0;
+
protected:
/**
protected:
/**