[dali_1.0.40] Merge branch 'tizen'

[platform/core/uifw/dali-demo.git] / examples / builder / examples.cpp

diff --git a/examples/builder/examples.cpp b/examples/builder/examples.cpp
index e00c114..65964dc 100644 (file)
--- a/examples/builder/examples.cpp
+++ b/examples/builder/examples.cpp
@@ -275,6 +275,7 @@ public:
   void EnterSelection()
   {
     Stage stage = Stage::GetCurrent();
+    stage.SetBackgroundColor( Color::WHITE );
 
     mTapDetector = TapGestureDetector::New();
     mTapDetector.DetectedSignal().Connect( this, &ExampleApp::OnTap );
@@ -287,7 +288,6 @@ public:
     mFiles.clear();
 
     mItemView = ItemView::New(*this);
-    mItemView.SetRelayoutEnabled( false );
     stage.Add( mItemView );
     mItemView.SetParentOrigin(ParentOrigin::CENTER);
     mItemView.SetAnchorPoint(AnchorPoint::CENTER);
@@ -395,7 +395,7 @@ public:
   {
     TextLabel label = TextLabel::New( ShortName( text ) );
     label.SetProperty( Dali::Toolkit::Control::Property::STYLE_NAME, "builderlabel" );
-    label.SetResizePolicy( FILL_TO_PARENT, WIDTH );
+    label.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
 
     // Hook up tap detector
     mTapDetector.Attach( label );
@@ -469,9 +469,6 @@ public:
     }
 
     builder.AddActors( layer );
-
-    // Force relayout on layer
-    layer.RelayoutRequestTree();
   }
 
 
@@ -591,7 +588,7 @@ private:
   GridLayoutPtr mGridLayout;
   ItemView mItemView;
 
-  Toolkit::View mView;
+  Toolkit::Control mView;
   unsigned int mOrientation;
 
   Toolkit::ToolBar mToolBar;