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
/
bloom-view
/
bloom-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
index
4d088d1
..
474a16e
100644
(file)
--- a/
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp
@@
-290,6
+290,8
@@
void BloomView::OnInitialize()
void BloomView::OnSizeSet(const Vector3& targetSize)
{
void BloomView::OnSizeSet(const Vector3& targetSize)
{
+ Control::OnSizeSet( targetSize );
+
mTargetSize = Vector2(targetSize);
mChildrenRoot.SetSize(targetSize);
mCompositeImageActor.SetSize(targetSize);
mTargetSize = Vector2(targetSize);
mChildrenRoot.SetSize(targetSize);
mCompositeImageActor.SetSize(targetSize);
@@
-313,17
+315,21
@@
void BloomView::OnSizeSet(const Vector3& targetSize)
}
}
}
}
-void BloomView::OnC
ontrolC
hildAdd( Actor& child )
+void BloomView::OnChildAdd( Actor& child )
{
{
+ Control::OnChildAdd( child );
+
if( child != mChildrenRoot && child != mInternalRoot)
{
mChildrenRoot.Add( child );
}
}
if( child != mChildrenRoot && child != mInternalRoot)
{
mChildrenRoot.Add( child );
}
}
-void BloomView::OnC
ontrolC
hildRemove( Actor& child )
+void BloomView::OnChildRemove( Actor& child )
{
mChildrenRoot.Remove( child );
{
mChildrenRoot.Remove( child );
+
+ Control::OnChildRemove( child );
}
void BloomView::AllocateResources()
}
void BloomView::AllocateResources()