KeyEvent class pimpling

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

diff --git a/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
index bf6067c..96e8a34 100644 (file)
--- a/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
+++ b/examples/image-view-alpha-blending/image-view-alpha-blending-example.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2018 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.
@@ -46,9 +46,9 @@ private:
   // The Init signal is received once (only) during the Application lifetime
   void Create( Application& application )
   {
-    // Get a handle to the stage
-    Stage stage = Stage::GetCurrent();
-    stage.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
+    // Get a handle to the window
+    Window window = application.GetWindow();
+    window.KeyEventSignal().Connect(this, &ImageViewAlphaBlendApp::OnKeyEvent);
 
     auto green0 = Vector4( 0.f, 1.f, 0.f, 0.25f );
     auto green1 = Vector4( 0.f, 0.25f, 0.f, 0.25f );
@@ -57,23 +57,23 @@ private:
     float imageSize = 512.f;
 
     Toolkit::ImageView imageView0 = CreateImageView( IMAGE_PATH );
-    imageView0.SetSize(imageSize, imageSize);
-    imageView0.SetParentOrigin( ParentOrigin::CENTER );
-    imageView0.SetY( -imageSize*0.5f );
-    stage.Add(imageView0);
+    imageView0.SetProperty( Actor::Property::SIZE, Vector2(imageSize, imageSize) );
+    imageView0.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    imageView0.SetProperty( Actor::Property::POSITION_Y,  -imageSize*0.5f );
+    window.Add(imageView0);
     Toolkit::ImageView imageView1 = CreateImageView( redGreen0 );
-    imageView1.SetParentOrigin( ParentOrigin::CENTER );
-    imageView1.SetSize(imageSize, imageSize);
+    imageView1.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    imageView1.SetProperty( Actor::Property::SIZE, Vector2(imageSize, imageSize) );
     imageView0.Add(imageView1);
 
     Toolkit::ImageView imageView2 = CreateImageView( IMAGE_PATH );
-    imageView2.SetSize(imageSize, imageSize);
-    imageView2.SetParentOrigin( ParentOrigin::CENTER );
-    imageView2.SetY( imageSize*0.5f );
-    stage.Add(imageView2);
+    imageView2.SetProperty( Actor::Property::SIZE, Vector2(imageSize, imageSize) );
+    imageView2.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    imageView2.SetProperty( Actor::Property::POSITION_Y,  imageSize*0.5f );
+    window.Add(imageView2);
     Toolkit::ImageView imageView3 = CreateImageView( redGreen1);
-    imageView3.SetParentOrigin( ParentOrigin::CENTER );
-    imageView3.SetSize(imageSize, imageSize);
+    imageView3.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER );
+    imageView3.SetProperty( Actor::Property::SIZE, Vector2(imageSize, imageSize) );
     imageView2.Add(imageView3);
 
     imageView2.SetProperty( Toolkit::ImageView::Property::PRE_MULTIPLIED_ALPHA, true );
@@ -88,7 +88,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) )
       {