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

[platform/core/uifw/dali-demo.git] / examples / motion-stretch / motion-stretch-example.cpp

diff --git a/examples/motion-stretch/motion-stretch-example.cpp b/examples/motion-stretch/motion-stretch-example.cpp
index 4389907..0dc404d 100644 (file)
--- a/examples/motion-stretch/motion-stretch-example.cpp
+++ b/examples/motion-stretch/motion-stretch-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -140,20 +140,25 @@ public:
                                             TOOLBAR_IMAGE,
                                             APPLICATION_TITLE );
 
+    // Ensure the content layer is a square so the touch area works in all orientations
+    Vector2 stageSize = Stage::GetCurrent().GetSize();
+    float size = std::max( stageSize.width, stageSize.height );
+    mContentLayer.SetProperty( Actor::Property::SIZE, Vector2( size, size ) );
+
     //Add an slideshow icon on the right of the title
     mActorEffectsButton = Toolkit::PushButton::New();
-    mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
-    mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
+    mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
+    mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
     mActorEffectsButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnEffectButtonClicked );
     mToolBar.AddControl( mActorEffectsButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalCenter, DemoHelper::DEFAULT_PLAY_PADDING );
 
     // Creates a mode button.
     // Create a effect toggle button. (right of toolbar)
     Toolkit::PushButton layoutButton = Toolkit::PushButton::New();
-    layoutButton.SetUnselectedImage( LAYOUT_IMAGE );
-    layoutButton.SetSelectedImage( LAYOUT_IMAGE_SELECTED );
+    layoutButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE );
+    layoutButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, LAYOUT_IMAGE_SELECTED );
     layoutButton.ClickedSignal().Connect( this, &MotionStretchExampleApp::OnLayoutButtonClicked);
-    layoutButton.SetLeaveRequired( true );
+    layoutButton.SetProperty( Actor::Property::LEAVE_REQUIRED, true );
     mToolBar.AddControl( layoutButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING );
 
     // Input
@@ -167,10 +172,10 @@ public:
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
     winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
     winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
+    winHandle.ResizedSignal().Connect( this, &MotionStretchExampleApp::OnWindowResized );
 
-    unsigned int degrees = 0;
-    Rotate( static_cast< DeviceOrientation >( degrees ) );
-
+    // set initial orientation
+    Rotate( PORTRAIT );
 
     ///////////////////////////////////////////////////////
     //
@@ -180,9 +185,9 @@ public:
     mMotionStretchEffect["url"] = MOTION_STRETCH_ACTOR_IMAGE1;
     mMotionStretchImageView = ImageView::New();
     mMotionStretchImageView.SetProperty( Toolkit::ImageView::Property::IMAGE, mMotionStretchEffect );
-    mMotionStretchImageView.SetParentOrigin( ParentOrigin::CENTER );
-    mMotionStretchImageView.SetAnchorPoint( AnchorPoint::CENTER );
-    mMotionStretchImageView.SetSize( MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT );
+    mMotionStretchImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    mMotionStretchImageView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER );
+    mMotionStretchImageView.SetProperty( Actor::Property::SIZE, Vector2( MOTION_STRETCH_ACTOR_WIDTH, MOTION_STRETCH_ACTOR_HEIGHT ) );
 
     mContentLayer.Add( mMotionStretchImageView );
 
@@ -196,16 +201,15 @@ public:
   //
   //
 
+  void OnWindowResized( Window::WindowSize size )
+  {
+    Rotate( size.GetWidth() > size.GetHeight() ? LANDSCAPE : PORTRAIT );
+  }
+
   void Rotate( DeviceOrientation orientation )
   {
     // Resize the root actor
-    Vector2 stageSize = Stage::GetCurrent().GetSize();
-    Vector2 targetSize = stageSize;
-    if( orientation == LANDSCAPE ||
-        orientation == LANDSCAPE_INVERSE )
-    {
-      targetSize = Vector2( stageSize.y, stageSize.x );
-    }
+    const Vector2 targetSize = Stage::GetCurrent().GetSize();
 
     if( mOrientation != orientation )
     {
@@ -216,22 +220,19 @@ public:
       {
         // has parent so we expect it to be on stage, start animation
         mRotateAnimation = Animation::New( ORIENTATION_DURATION );
-        mRotateAnimation.AnimateTo( Property( mView, Actor::Property::ORIENTATION ), Quaternion( Radian( Degree( -orientation ) ), Vector3::ZAXIS ), AlphaFunction::EASE_OUT );
         mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_WIDTH ), targetSize.width );
         mRotateAnimation.AnimateTo( Property( mView, Actor::Property::SIZE_HEIGHT ), targetSize.height );
         mRotateAnimation.Play();
       }
       else
       {
-        // set the rotation to match the orientation
-        mView.SetOrientation( Degree( -orientation ), Vector3::ZAXIS );
-        mView.SetSize( targetSize );
+        mView.SetProperty( Actor::Property::SIZE, targetSize );
       }
     }
     else
     {
       // for first time just set size
-      mView.SetSize( targetSize );
+      mView.SetProperty( Actor::Property::SIZE, targetSize );
     }
   }
 
@@ -333,14 +334,14 @@ public:
     if(!mActorEffectsEnabled)
     {
       mActorEffectsEnabled = true;
-      mActorEffectsButton.SetUnselectedImage( EFFECTS_ON_ICON );
-      mActorEffectsButton.SetSelectedImage( EFFECTS_ON_ICON_SELECTED );
+      mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON );
+      mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_ON_ICON_SELECTED );
     }
     else
     {
       mActorEffectsEnabled = false;
-      mActorEffectsButton.SetUnselectedImage( EFFECTS_OFF_ICON );
-      mActorEffectsButton.SetSelectedImage( EFFECTS_OFF_ICON_SELECTED );
+      mActorEffectsButton.SetProperty( Toolkit::Button::Property::UNSELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON );
+      mActorEffectsButton.SetProperty( Toolkit::Button::Property::SELECTED_BACKGROUND_VISUAL, EFFECTS_OFF_ICON_SELECTED );
     }
   }
 
@@ -426,20 +427,10 @@ private:
 
 };
 
-void RunTest(Application& app)
-{
-  MotionStretchExampleApp test(app);
-
-  app.MainLoop();
-}
-
-// Entry point for Linux & Tizen applications
-//
 int DALI_EXPORT_API main(int argc, char **argv)
 {
   Application app = Application::New(&argc, &argv, DEMO_THEME_PATH);
-
-  RunTest(app);
-
+  MotionStretchExampleApp test(app);
+  app.MainLoop();
   return 0;
 }