Changes required after Visual related Control APIs moved to Devel API

Change-Id: Ie1172a02636929b88e11a8c2683f6ef5092cb55a

diff --git a/examples/simple-visuals-control/my-control-impl.cpp b/examples/simple-visuals-control/my-control-impl.cpp
index 7c8a602..9a2aa51 100644 (file)
--- a/examples/simple-visuals-control/my-control-impl.cpp
+++ b/examples/simple-visuals-control/my-control-impl.cpp
@@ -26,6 +26,7 @@
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -102,7 +103,7 @@ void MyControl::SetProperty( BaseObject* object, Property::Index index, const Pr
 
         if ( iconVisual )
         {
-          impl.RegisterVisual( index, iconVisual );
+          DevelControl::RegisterVisual( impl, index, iconVisual );
         }
         break;
       }
@@ -123,7 +124,8 @@ Property::Value MyControl::GetProperty( BaseObject* object, Property::Index prop
       case Demo::MyControl::Property::ICON_VISUAL:
       {
         Property::Map map;
-        Toolkit::Visual::Base visual =  GetImpl( myControl ).GetVisual( propertyIndex );
+        MyControl& impl = GetImpl( myControl );
+        Toolkit::Visual::Base visual =  DevelControl::GetVisual( impl, propertyIndex );
         if ( visual )
         {
           visual.CreatePropertyMap( map ); // Creates a Property map containing the Visual that ICON_VISUAL currently is. Can change if state changes.

diff --git a/examples/styling/image-channel-control-impl.cpp b/examples/styling/image-channel-control-impl.cpp
index 2d2f48c..b0d9dbb 100644 (file)
--- a/examples/styling/image-channel-control-impl.cpp
+++ b/examples/styling/image-channel-control-impl.cpp
@@ -18,6 +18,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
@@ -104,7 +105,7 @@ void ImageChannelControl::SetImage( const std::string& url )
   properties[Dali::Toolkit::ImageVisual::Property::URL] = url;
 
   mVisual = Toolkit::VisualFactory::Get().CreateVisual( properties );
-  RegisterVisual( Demo::ImageChannelControl::Property::IMAGE_VISUAL, mVisual );
+  Toolkit::DevelControl::RegisterVisual( *this, Demo::ImageChannelControl::Property::IMAGE_VISUAL, mVisual );
   mVisual.SetName("imageVisual");
 
   RelayoutRequest();
@@ -127,14 +128,14 @@ void ImageChannelControl::SetVisibility( bool visibility )
     {
       if( mDisableVisibilityTransition.Count() > 0 )
       {
-        mAnimation = CreateTransition( mDisableVisibilityTransition );
+        mAnimation = Toolkit::DevelControl::CreateTransition( *this, mDisableVisibilityTransition );
       }
     }
     else
     {
       if( mEnableVisibilityTransition.Count() > 0 )
       {
-        mAnimation = CreateTransition( mEnableVisibilityTransition );
+        mAnimation = Toolkit::DevelControl::CreateTransition( *this, mEnableVisibilityTransition );
       }
     }
   }
@@ -236,7 +237,7 @@ void ImageChannelControl::SetProperty( BaseObject* object, Property::Index index
         if( map )
         {
           impl.mVisual = Toolkit::VisualFactory::Get().CreateVisual( *map );
-          impl.RegisterVisual( Demo::ImageChannelControl::Property::IMAGE_VISUAL, impl.mVisual );
+          Toolkit::DevelControl::RegisterVisual( impl, Demo::ImageChannelControl::Property::IMAGE_VISUAL, impl.mVisual );
         }
         break;
       }

diff --git a/examples/transitions/shadow-button-impl.cpp b/examples/transitions/shadow-button-impl.cpp
index e24041a..edcfbec 100644 (file)
--- a/examples/transitions/shadow-button-impl.cpp
+++ b/examples/transitions/shadow-button-impl.cpp
@@ -21,6 +21,7 @@
 #include <dali-toolkit/devel-api/align-enums.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 
 #include <cstdio>
 
@@ -124,7 +125,7 @@ bool ShadowButton::GetActiveState()
 void ShadowButton::SetCheckState( bool checkState )
 {
   mCheckState = checkState;
-  EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
+  DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, true );
   if( Self().OnStage() )
   {
     if( checkState )
@@ -157,7 +158,7 @@ void ShadowButton::StartTransition( Property::Index transitionId )
       iter->mAnimation.FinishedSignal().Disconnect( this, &ShadowButton::OnTransitionFinished );
     }
 
-    iter->mAnimation = CreateTransition( iter->mTransitionData );
+    iter->mAnimation = DevelControl::CreateTransition( *this, iter->mTransitionData );
     StoreTargetLayouts( iter->mTransitionData );
 
     iter->mAnimation.FinishedSignal().Connect( this, &ShadowButton::OnTransitionFinished );
@@ -189,7 +190,7 @@ void ShadowButton::OnTransitionFinished( Animation& src )
         }
         case Demo::ShadowButton::Property::UNCHECK_TRANSITION:
         {
-          EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
+          DevelControl::EnableVisual( *this, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, false );
           break;
         }
       }
@@ -352,25 +353,25 @@ void ShadowButton::ResetVisual(
     {
       case Demo::ShadowButton::Property::BACKGROUND_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(0.0f);
         break;
       }
       case Demo::ShadowButton::Property::CHECKBOX_BG_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(1.0f);
         break;
       }
       case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
       {
-        RegisterVisual( index, visual, mCheckState );
+        DevelControl::RegisterVisual( *this, index, visual, mCheckState );
         visual.SetDepthIndex(2.0f);
         break;
       }
       case Demo::ShadowButton::Property::LABEL_VISUAL:
       {
-        RegisterVisual( index, visual );
+        DevelControl::RegisterVisual( *this, index, visual );
         visual.SetDepthIndex(1.0f);
         break;
       }
@@ -496,7 +497,7 @@ void ShadowButton::SetProperty( BaseObject* object, Property::Index index, const
       case Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL:
       {
         impl.ResetVisual( index, impl.mCheckboxFgVisual, value );
-        impl.EnableVisual( Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
+        DevelControl::EnableVisual( impl, Demo::ShadowButton::Property::CHECKBOX_FG_VISUAL, impl.mCheckState );
         break;
       }
       case Demo::ShadowButton::Property::LABEL_VISUAL:

diff --git a/examples/visual-transitions/beat-control-impl.cpp b/examples/visual-transitions/beat-control-impl.cpp
index ef0c56d..d160e5b 100644 (file)
--- a/examples/visual-transitions/beat-control-impl.cpp
+++ b/examples/visual-transitions/beat-control-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
@@ -18,6 +18,7 @@
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali/public-api/object/type-registry-helper.h>
 #include <dali-toolkit/devel-api/align-enums.h>
+#include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/visual-factory/visual-factory.h>
 #include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
 
@@ -102,7 +103,7 @@ void BeatControl::StartBounceAnimation()
     OnBounceAnimationFinished(mAnimation);
   }
 
-  mAnimation = CreateTransition( mBounceTransition );
+  mAnimation = DevelControl::CreateTransition( *this, mBounceTransition );
   mAnimation.FinishedSignal().Connect( this, &BeatControl::OnBounceAnimationFinished );
   mAnimation.Play();
   mAnimationPlaying |= BOUNCE_ANIMATION_RUNNING;
@@ -118,7 +119,7 @@ void BeatControl::StartXAnimation()
     OnXAnimationFinished(mXAnimation);
   }
 
-  mXAnimation = CreateTransition( mLeftTransition );
+  mXAnimation = DevelControl::CreateTransition( *this, mLeftTransition );
   mXAnimation.FinishedSignal().Connect( this, &BeatControl::OnXAnimationFinished );
   mXAnimation.Play();
   mAnimationPlaying |= X_ANIMATION_RUNNING;
@@ -133,7 +134,7 @@ void BeatControl::StartYAnimation()
     OnYAnimationFinished(mYAnimation);
   }
 
-  mYAnimation = CreateTransition( mUpTransition );
+  mYAnimation = DevelControl::CreateTransition( *this, mUpTransition );
   mYAnimation.FinishedSignal().Connect( this, &BeatControl::OnYAnimationFinished );
   mYAnimation.Play();
   mAnimationPlaying |= Y_ANIMATION_RUNNING;
@@ -148,7 +149,7 @@ void BeatControl::StartFadeAnimation()
     OnFadeAnimationFinished(mFadeAnimation);
   }
 
-  mFadeAnimation = CreateTransition( mFadeTransition );
+  mFadeAnimation = DevelControl::CreateTransition( *this, mFadeTransition );
   mFadeAnimation.FinishedSignal().Connect( this, &BeatControl::OnFadeAnimationFinished );
   mFadeAnimation.Play();
   mAnimationPlaying |= FADE_ANIMATION_RUNNING;
@@ -276,7 +277,7 @@ void BeatControl::SetProperty( BaseObject* object, Property::Index index, const
           {
             // Only register a visual if there is more than just a size setting
             impl.mVisual = Toolkit::VisualFactory::Get().CreateVisual( *map );
-            impl.RegisterVisual( Demo::BeatControl::Property::BEAT_VISUAL, impl.mVisual );
+            DevelControl::RegisterVisual( impl, Demo::BeatControl::Property::BEAT_VISUAL, impl.mVisual );
 
             // We have registered a new visual: must trigger size negotiation
             // in order to call SetTransformAndSize on the visual with the right size: