Merge "Removing unused variables" into devel/master

[platform/core/uifw/dali-demo.git] / examples / arc-visual / arc-visual-example.cpp

diff --git a/examples/arc-visual/arc-visual-example.cpp b/examples/arc-visual/arc-visual-example.cpp
index 984ab0d..708f7d5 100644 (file)
--- a/examples/arc-visual/arc-visual-example.cpp
+++ b/examples/arc-visual/arc-visual-example.cpp
@@ -49,7 +49,8 @@ const Property::Value TEXT_BACKGROUND
 {
   { Visual::Property::TYPE, Visual::COLOR },
   { ColorVisual::Property::MIX_COLOR, Vector4( 0.8f, 0.8f, 0.8f, 1.0f ) },
-  { DevelVisual::Property::CORNER_RADIUS, 10.0f }
+  { DevelVisual::Property::CORNER_RADIUS, 0.5f },
+  { DevelVisual::Property::CORNER_RADIUS_POLICY, Toolkit::Visual::Transform::Policy::RELATIVE }
 };
 
 const Property::Value TRANSITION_ANIMATOR
@@ -170,7 +171,7 @@ private:
     window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent );
   }
 
-  bool OnButtonTouch( Actor actor, const TouchData& touch )
+  bool OnButtonTouch( Actor actor, const TouchEvent& touch )
   {
     if( touch.GetState( 0 ) == PointState::UP )
     {
@@ -211,7 +212,7 @@ private:
     return true;
   }
 
-  bool OnTouch( Actor actor, const TouchData& touch )
+  bool OnTouch( Actor actor, const TouchEvent& touch )
   {
     if( touch.GetState( 0 ) == PointState::UP )
     {
@@ -228,7 +229,7 @@ private:
 
   void OnKeyEvent( const KeyEvent& event )
   {
-    if( event.state == KeyEvent::Up )
+    if( event.GetState() == KeyEvent::UP )
     {
       if( IsKey( event, DALI_KEY_ESCAPE) || IsKey( event, DALI_KEY_BACK ) )
       {