X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Ftool-bar%2Ftool-bar-impl.cpp;h=441b640e927166ecbf4af06e30c33864293e0cf0;hb=a76ab01e4bdaf91bbf3b2588e1a8c628a152bc6a;hp=851945dd5b2441645312498dbcc754c04eb14b0f;hpb=84e05cec3039abe8ecaaa950d4f93dd4f94282fe;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp index 851945d..441b640 100644 --- a/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp +++ b/dali-toolkit/internal/controls/tool-bar/tool-bar-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -317,8 +317,6 @@ void ToolBar::OnInitialize() void ToolBar::OnChildAdd(Actor& child) { - Control::OnChildAdd( child ); - if( !mInitializing ) { // An actor is being added through the Actor's API. @@ -335,6 +333,8 @@ void ToolBar::OnChildAdd(Actor& child) // No OnChildRemove method required because Actors are added to the mLayout table view, so if an // actor is removed using the Actor::RemoveChild method it will not remove anything because the // actor is in mLayout not in Self(). + + Control::OnChildAdd( child ); } } // namespace Internal