Revert "Updates following rename of PropertyBuffer"

[platform/core/uifw/dali-demo.git] / examples / bezier-curve / bezier-curve-example.cpp

diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp
index 4670c5f..677152e 100644 (file)
--- a/examples/bezier-curve/bezier-curve-example.cpp
+++ b/examples/bezier-curve/bezier-curve-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -17,6 +17,7 @@
 
 #include <dali/dali.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/table-view/table-view.h>
 #include "shared/view.h"
 
 #include <sstream>
@@ -148,13 +149,10 @@ public:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Hide the indicator bar
-    application.GetWindow().ShowIndicator( Dali::Window::INVISIBLE );
+    Window window = mApplication.GetWindow();
+    window.KeyEventSignal().Connect( this, &BezierCurveExample::OnKeyEvent );
 
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect( this, &BezierCurveExample::OnKeyEvent );
-
-    CreateBackground(stage);
+    CreateBackground(window);
 
     mControlPointScale = 0.5f;
     mControlPointZoomScale = mControlPointScale * 2.0f;
@@ -163,7 +161,7 @@ public:
     mContentLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
     mContentLayer.TouchSignal().Connect(this, &BezierCurveExample::OnTouchLayer);
     mContentLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
-    stage.Add( mContentLayer );
+    window.Add( mContentLayer );
 
     // 6 rows: title, grid, coords, play, anim1, anim2
     TableView contentLayout = TableView::New(5, 1);
@@ -277,7 +275,7 @@ public:
     UpdateCurve();
   }
 
-  void CreateBackground( Stage stage )
+  void CreateBackground( Window window )
   {
     Toolkit::Control background = Dali::Toolkit::Control::New();
     background.SetProperty( Actor::Property::ANCHOR_POINT, Dali::AnchorPoint::CENTER );
@@ -288,7 +286,7 @@ public:
     map.Insert( Visual::Property::TYPE,  Visual::COLOR );
     map.Insert( ColorVisual::Property::MIX_COLOR, Vector4( 253/255.0f, 245/255.0f, 230/255.0f, 1.0f ) );
     background.SetProperty( Dali::Toolkit::Control::Property::BACKGROUND, map );
-    stage.Add( background );
+    window.Add( background );
   }
 
   void CreateCubic(Actor parent)
@@ -318,7 +316,7 @@ public:
   Actor CreateControlPoint( Actor parent, const char* url, Vector3 position)
   {
     Actor actor = ImageView::New( url );
-    actor.SetScale( mControlPointScale);
+    actor.SetProperty( Actor::Property::SCALE, mControlPointScale);
     actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
     // Curve and line drawing works off current value (i.e. last update frame's value). Need to animate to ensure
     // initial position is baked to both frames before initially drawing the curve.
@@ -357,12 +355,12 @@ public:
     mControlPoint1 = CreateControlPoint( parent,
                                          CIRCLE1_IMAGE,
                                          CONTROL_POINT1_ORIGIN );
-    mControlPoint1Id = mControlPoint1.GetId();
+    mControlPoint1Id = mControlPoint1.GetProperty< int >( Actor::Property::ID );
 
     mControlPoint2 = CreateControlPoint( parent,
                                          CIRCLE2_IMAGE,
                                          CONTROL_POINT2_ORIGIN );
-    mControlPoint2Id = mControlPoint2.GetId();
+    mControlPoint2Id = mControlPoint2.GetProperty< int >( Actor::Property::ID );
 
     Property::Map lineVertexFormat;
     lineVertexFormat["aPosition"] = Property::VECTOR2;
@@ -494,7 +492,7 @@ public:
     }
   }
 
-  bool OnTouchControlPoint( Actor controlPoint, const TouchData& event )
+  bool OnTouchControlPoint( Actor controlPoint, const TouchEvent& event )
   {
     if( event.GetPointCount() > 0 )
     {
@@ -512,7 +510,7 @@ public:
     return false; // Don't mark this as consumed - let the layer get the touch
   }
 
-  bool OnTouchLayer( Actor actor, const TouchData& event )
+  bool OnTouchLayer( Actor actor, const TouchEvent& event )
   {
     if( event.GetPointCount() > 0 )
     {
@@ -520,7 +518,7 @@ public:
       {
         Vector3 position( event.GetScreenPosition( 0 ) );
 
-        mDragActor.SetPosition( position - Vector3( mRelativeDragPoint ) );
+        mDragActor.SetProperty( Actor::Property::POSITION, position - Vector3( mRelativeDragPoint ) );
 
         if( event.GetState( 0 ) == PointState::UP ) // Stop dragging
         {