Further Setter/Getter public API removal from Dali::Actor

[platform/core/uifw/dali-demo.git] / examples / animated-images / animated-images-example.cpp

diff --git a/examples/animated-images/animated-images-example.cpp b/examples/animated-images/animated-images-example.cpp
index 925d754..63e1835 100644 (file)
--- a/examples/animated-images/animated-images-example.cpp
+++ b/examples/animated-images/animated-images-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -16,7 +16,6 @@
  */
 
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/buttons/button-devel.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visuals/animated-image-visual-actions-devel.h>
 
@@ -132,11 +131,11 @@ private:
     mArrayButton = CreateRadioButton( ARRAY_RADIO_BUTTON_NAME, false );
 
     Toolkit::TableView radioButtonLayout = Toolkit::TableView::New( 1, 2 );
-    radioButtonLayout.SetName( "RadioButtonsLayout" );
+    radioButtonLayout.SetProperty( Dali::Actor::Property::NAME, "RadioButtonsLayout" );
     radioButtonLayout.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT );
     radioButtonLayout.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH );
-    radioButtonLayout.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-    radioButtonLayout.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER );
+    radioButtonLayout.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+    radioButtonLayout.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::BOTTOM_CENTER );
     radioButtonLayout.SetFitHeight( 0 );
     radioButtonLayout.AddChild( mGifButton, TableView::CellPosition( 0, 0 ) );
     radioButtonLayout.AddChild( mArrayButton, TableView::CellPosition( 0, 1 ) );
@@ -146,7 +145,7 @@ private:
     radioButtonLayout.SetCellAlignment( TableView::CellPosition( 0, 1 ),
                                         HorizontalAlignment::CENTER,
                                         VerticalAlignment::CENTER );
-    radioButtonLayout.SetY( -10.0f );
+    radioButtonLayout.SetProperty( Actor::Property::POSITION_Y,  -10.0f );
 
     Stage::GetCurrent().Add( radioButtonLayout );
   }
@@ -184,9 +183,9 @@ private:
       // Create and lay out the image view according to the index
       control = Toolkit::ImageView::New();
       control.SetProperty( Toolkit::ImageView::Property::IMAGE, SetupViewProperties( mImageType, index ) );
-      control.SetAnchorPoint( IMAGE_LAYOUT_INFO[ index ].anchorPoint );
-      control.SetParentOrigin( IMAGE_LAYOUT_INFO[ index ].parentOrigin );
-      control.SetY( IMAGE_LAYOUT_INFO[ index ].yPosition );
+      control.SetProperty( Actor::Property::ANCHOR_POINT, IMAGE_LAYOUT_INFO[ index ].anchorPoint );
+      control.SetProperty( Actor::Property::PARENT_ORIGIN, IMAGE_LAYOUT_INFO[ index ].parentOrigin );
+      control.SetProperty( Actor::Property::POSITION_Y,  IMAGE_LAYOUT_INFO[ index ].yPosition );
 
       // We do not want the animated image playing when it's added to the stage.
       PauseAnimatedImage( control );
@@ -228,10 +227,10 @@ private:
 
     // Create a push button, and add it as child of the control
     Toolkit::PushButton animateButton = Toolkit::PushButton::New();
-    animateButton.SetProperty( Toolkit::DevelButton::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED );
-    animateButton.SetProperty( Toolkit::DevelButton::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
-    animateButton.SetParentOrigin( ParentOrigin::CENTER );
-    animateButton.SetAnchorPoint( AnchorPoint::CENTER );
+    animateButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, PLAY_ICON_UNSELECTED );
+    animateButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, PLAY_ICON_SELECTED );
+    animateButton.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    animateButton.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
     animateButton.ClickedSignal().Connect( this, &AnimatedImageController::OnPlayButtonClicked );
     control.Add( animateButton );