Revert "Updated needed for Internal::Control cleanup"

This reverts commit 49fdbca4c0382c4b8f437a46f3543330d307e1ff.

diff --git a/examples/cluster/cluster-impl.cpp b/examples/cluster/cluster-impl.cpp
index 0edda67..1185549 100644 (file)
--- a/examples/cluster/cluster-impl.cpp
+++ b/examples/cluster/cluster-impl.cpp
@@ -92,7 +92,7 @@ void Cluster::OnInitialize()
 {
 }
 
-void Cluster::OnSizeSet( const Vector3& targetSize )
+void Cluster::OnControlSizeSet( const Vector3& targetSize )
 {
   mClusterSize = targetSize;
   GetImpl(mClusterStyle).SetClusterSize(targetSize);

diff --git a/examples/cluster/cluster-impl.h b/examples/cluster/cluster-impl.h
index 7c8a408..f57c221 100644 (file)
--- a/examples/cluster/cluster-impl.h
+++ b/examples/cluster/cluster-impl.h
@@ -253,15 +253,15 @@ public:
 private: // From Control
 
   /**
-   * @copydoc Control::OnInitialize()
+   * @copydoc Demo::Control::OnInitialize()
    */
   virtual void OnInitialize();
 
   /**
    *
-   * @copydoc CustomActorImpl::OnSizeSet( const Vector3& targetSize )
+   * @copydoc Demo::Control::OnControlSizeSet( const Vector3& targetSize )
    */
-  virtual void OnSizeSet( const Vector3& targetSize );
+  virtual void OnControlSizeSet( const Vector3& targetSize );
 
 protected:
 

diff --git a/shared/view.h b/shared/view.h
index dcf8e9a..ce27187 100644 (file)
--- a/shared/view.h
+++ b/shared/view.h
@@ -79,12 +79,16 @@ Dali::Layer CreateToolbar( Dali::Toolkit::ToolBar& toolBar,
 
   // Tool bar
   Dali::Image image = Dali::ResourceImage::New( toolbarImagePath );
+  Dali::ImageActor toolBarBackground = Dali::ImageActor::New( image );
+  toolBarBackground.SetName( "TOOLBAR_BACKGROUND" );
+  toolBarBackground.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
   toolBar = Dali::Toolkit::ToolBar::New();
   toolBar.SetName( "TOOLBAR" );
-  toolBar.SetBackgroundImage( image );
+  toolBar.SetBackground( toolBarBackground );
   toolBar.SetParentOrigin( Dali::ParentOrigin::TOP_CENTER );
   toolBar.SetAnchorPoint( Dali::AnchorPoint::TOP_CENTER );
   toolBar.SetResizePolicy( Dali::ResizePolicy::FILL_TO_PARENT, Dali::Dimension::ALL_DIMENSIONS );
+  toolBarBackground.SetSortModifier(1.0f);
 
   // Add the tool bar to the too bar layer.
   toolBarLayer.Add( toolBar );