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
Remove OnControl methods & add up-calls
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
table-view
/
table-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
b/dali-toolkit/internal/controls/table-view/table-view-impl.cpp
index
a730e40
..
bac0402
100644
(file)
--- a/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/table-view/table-view-impl.cpp
@@
-287,7
+287,7
@@
Actor TableView::RemoveChildAt( const Toolkit::TableView::CellPosition& position
if( child )
{
RelayoutingLock lock( *this );
if( child )
{
RelayoutingLock lock( *this );
- // Remove the child, this will trigger a call to OnC
ontrolC
hildRemove
+ // Remove the child, this will trigger a call to OnChildRemove
Self().Remove( child );
// relayout the table only if instances were found
Self().Remove( child );
// relayout the table only if instances were found
@@
-968,8
+968,10
@@
Property::Value TableView::GetProperty( BaseObject* object, Property::Index inde
return value;
}
return value;
}
-void TableView::OnC
ontrolC
hildAdd( Actor& child )
+void TableView::OnChildAdd( Actor& child )
{
{
+ Control::OnChildAdd( child );
+
if( mLayoutingChild )
{
// we're in the middle of laying out children so no point doing anything here
if( mLayoutingChild )
{
// we're in the middle of laying out children so no point doing anything here
@@
-1061,7
+1063,7
@@
void TableView::OnControlChildAdd( Actor& child )
RelayoutRequest();
}
RelayoutRequest();
}
-void TableView::OnC
ontrolC
hildRemove( Actor& child )
+void TableView::OnChildRemove( Actor& child )
{
// dont process if we're in the middle of bigger operation like delete row, column or resize
if( !mLayoutingChild )
{
// dont process if we're in the middle of bigger operation like delete row, column or resize
if( !mLayoutingChild )
@@
-1072,6
+1074,8
@@
void TableView::OnControlChildRemove( Actor& child )
RelayoutRequest();
}
}
RelayoutRequest();
}
}
+
+ Control::OnChildRemove( child );
}
TableView::TableView( unsigned int initialRows, unsigned int initialColumns )
}
TableView::TableView( unsigned int initialRows, unsigned int initialColumns )