Changes after TouchedSignal changes

[platform/core/uifw/dali-demo.git] / examples / alpha-blending-cpu / alpha-blending-cpu-example.cpp

diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
index f58e33f..4080037 100644 (file)
--- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
+++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 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.
@@ -53,45 +53,45 @@ private:
     // This creates an image view with one of 3 images, and one of 2 masks.
     // Clicking the screen will cycle through each combination of mask and image.
 
-    // Get a handle to the stage
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
-    stage.SetBackgroundColor( Color::WHITE );
+    // Get a handle to the window
+    Window window = application.GetWindow();
+    window.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
+    window.SetBackgroundColor( Color::WHITE );
 
     mImageView = Toolkit::ImageView::New();
 
-    mImageView.SetSize(200, 200);
-    mImageView.SetParentOrigin( ParentOrigin::CENTER );
-    stage.Add(mImageView);
+    mImageView.SetProperty( Actor::Property::SIZE, Vector2(200, 200) );
+    mImageView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    window.Add(mImageView);
 
     mImageLabel = Toolkit::TextLabel::New();
-    mImageLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-    mImageLabel.SetAnchorPoint( ParentOrigin::BOTTOM_CENTER );
-    mImageLabel.SetPosition( Vector3( 0.0f, -50.0f, 0.0f ) );
+    mImageLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+    mImageLabel.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::BOTTOM_CENTER );
+    mImageLabel.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, -50.0f, 0.0f ) );
     mImageLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK );
-    stage.Add(mImageLabel);
+    window.Add(mImageLabel);
 
     mMaskLabel = Toolkit::TextLabel::New();
-    mMaskLabel.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-    mMaskLabel.SetAnchorPoint( ParentOrigin::BOTTOM_CENTER );
-    mMaskLabel.SetPosition( Vector3( 0.0f, 0.0f, 0.0f ) );
+    mMaskLabel.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::BOTTOM_CENTER );
+    mMaskLabel.SetProperty( Actor::Property::ANCHOR_POINT, ParentOrigin::BOTTOM_CENTER );
+    mMaskLabel.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f ) );
     mMaskLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::BLACK );
-    stage.Add(mMaskLabel);
+    window.Add(mMaskLabel);
 
     LoadImages();
 
-    stage.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
+    window.TouchedSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched );
   }
 
-  void OnTouched( const TouchData& touchData )
+  void OnTouched( const TouchEvent& touch )
   {
     static bool touched = false;
-    if( touchData.GetState( 0 ) == PointState::DOWN )
+    if( touch.GetState( 0 ) == PointState::DOWN )
     {
       touched = true;
     }
 
-    if( touchData.GetState( 0 ) == PointState::UP && touched)
+    if( touch.GetState( 0 ) == PointState::UP && touched )
     {
       mImageCombinationIndex++;
       touched = false;
@@ -131,7 +131,7 @@ private:
 
   void OnKeyEvent(const KeyEvent& event)
   {
-    if(event.state == KeyEvent::Down)
+    if(event.GetState() == KeyEvent::DOWN)
     {
       if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
       {