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 "Fixed interaction between scale dimensions and bevel percentage properties...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.h
diff --git
a/dali-toolkit/internal/controls/table-view/table-view-impl.h
b/dali-toolkit/internal/controls/table-view/table-view-impl.h
index
2543b5e
..
d6e62b6
100644
(file)
--- a/
dali-toolkit/internal/controls/table-view/table-view-impl.h
+++ b/
dali-toolkit/internal/controls/table-view/table-view-impl.h
@@
-212,14
+212,14
@@
public:
private: // From Control
/**
private: // From Control
/**
- * @copydoc Control::OnC
ontrolC
hildAdd(Actor& child)
+ * @copydoc Control::OnChildAdd(Actor& child)
*/
*/
- virtual void OnC
ontrolC
hildAdd( Actor& child );
+ virtual void OnChildAdd( Actor& child );
/**
/**
- * @copydoc Control::OnC
ontrolC
hildRemove(Actor& child)
+ * @copydoc Control::OnChildRemove(Actor& child)
*/
*/
- virtual void OnC
ontrolC
hildRemove( Actor& child );
+ virtual void OnChildRemove( Actor& child );
/**
* @copydoc Control::OnRelayout
/**
* @copydoc Control::OnRelayout
@@
-261,6
+261,11
@@
private: // From Control
*/
virtual void OnLayoutNegotiated( float size, Dimension::Type dimension );
*/
virtual void OnLayoutNegotiated( float size, Dimension::Type dimension );
+ /**
+ * @copydoc CustomActorImpl::OnSizeSet( const Vector3& size )
+ */
+ virtual void OnSizeSet( const Vector3& size );
+
private: // Implementation
/**
private: // Implementation
/**