Merge "If the currently focused actor is hidden or disabled, it should lose focus...
[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / control-impl.cpp
index 372cfdb..9b10ffd 100644 (file)
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
 #include <dali-toolkit/public-api/controls/control-impl.h>
 
 // EXTERNAL INCLUDES
+#include <dali/devel-api/actors/actor-devel.h>
+#include <dali/devel-api/common/stage.h>
+#include <dali/devel-api/scripting/scripting.h>
+#include <dali/integration-api/debug.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/object/type-info.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
 #include <cstring> // for strcmp
 #include <limits>
 #include <stack>
 #include <typeinfo>
-#include <dali/public-api/animation/constraint.h>
-#include <dali/public-api/object/type-registry-helper.h>
-#include <dali/public-api/size-negotiation/relayout-container.h>
-#include <dali/devel-api/scripting/scripting.h>
-#include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali-toolkit/public-api/align-enumerations.h>
-#include <dali-toolkit/public-api/controls/control.h>
-#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
-#include <dali-toolkit/public-api/styling/style-manager.h>
-#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
-#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/devel-api/controls/control-devel.h>
 #include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/devel-api/visuals/visual-actions-devel.h>
 #include <dali-toolkit/devel-api/visuals/color-visual-properties-devel.h>
-#include <dali-toolkit/devel-api/visuals/color-visual-actions-devel.h>
+#include <dali-toolkit/internal/controls/control/control-data-impl.h>
 #include <dali-toolkit/internal/styling/style-manager-impl.h>
 #include <dali-toolkit/internal/visuals/color/color-visual.h>
 #include <dali-toolkit/internal/visuals/visual-string-constants.h>
-#include <dali-toolkit/internal/controls/control/control-data-impl.h>
+#include <dali-toolkit/public-api/align-enumerations.h>
+#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/controls/image-view/image-view.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>
+#include <dali-toolkit/public-api/visuals/color-visual-properties.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
 
 namespace Dali
 {
-
 namespace Toolkit
 {
-
 namespace Internal
 {
-
 namespace
 {
-
 #if defined(DEBUG_ENABLED)
-Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
+Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS");
 #endif
 
 /**
- * @brief Replace the background visual if it's a color visual with the renderIfTransparent property set as required.
- * @param[in] controlImpl The control implementation
- * @param[in] renderIfTransaparent Whether we should render if the color is transparent
- */
-void ChangeBackgroundColorVisual( Control& controlImpl, bool renderIfTransparent )
-{
-  Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl );
-
-  Toolkit::Visual::Base backgroundVisual = controlDataImpl.GetVisual( Toolkit::Control::Property::BACKGROUND );
-  if( backgroundVisual && backgroundVisual.GetType() == Toolkit::Visual::COLOR )
-  {
-    Property::Map map;
-    backgroundVisual.CreatePropertyMap( map );
-
-    // Only change it if it's a color visual
-    map[ Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT ] = renderIfTransparent;
-    controlImpl.SetBackground( map );
-  }
-}
-
-/**
  * @brief Creates a clipping renderer if required.
  * (EG. If no renders exist and clipping is enabled).
  * @param[in] controlImpl The control implementation.
  */
-void CreateClippingRenderer( Control& controlImpl )
+void CreateClippingRenderer(Control& controlImpl)
 {
   // We want to add a transparent background if we do not have one for clipping.
-  Actor self( controlImpl.Self() );
-  int clippingMode = ClippingMode::DISABLED;
-  if( self.GetProperty( Actor::Property::CLIPPING_MODE ).Get( clippingMode ) )
+  Actor self(controlImpl.Self());
+  int   clippingMode = ClippingMode::DISABLED;
+  if(self.GetProperty(Actor::Property::CLIPPING_MODE).Get(clippingMode))
   {
-    switch( clippingMode )
-    {
-      case ClippingMode::CLIP_CHILDREN:
-      {
-        if( self.GetRendererCount() == 0u )
-        {
-          Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get( controlImpl );
-          if( controlDataImpl.mVisuals.Empty() )
-          {
-            controlImpl.SetBackgroundColor( Color::TRANSPARENT );
-          }
-          else
-          {
-            // We have visuals, check if we've set the background and re-create it to
-            // render even if transparent (only if it's a color visual)
-            ChangeBackgroundColorVisual( controlImpl, true );
-          }
-        }
-        break;
-      }
+    Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(controlImpl);
 
-      case ClippingMode::DISABLED:
-      case ClippingMode::CLIP_TO_BOUNDING_BOX:
-      {
-        // If we have a background visual, check if it's a color visual and remove the render if transparent flag
-        ChangeBackgroundColorVisual( controlImpl, false );
-        break;
-      }
+    if(clippingMode == ClippingMode::CLIP_CHILDREN && controlDataImpl.mVisuals.Empty() && self.GetRendererCount() == 0u)
+    {
+      controlImpl.SetBackgroundColor(Color::TRANSPARENT);
     }
   }
 }
 
 } // unnamed namespace
 
-
 Toolkit::Control Control::New()
 {
+  return New(ControlBehaviour::CONTROL_BEHAVIOUR_DEFAULT);
+}
+
+Toolkit::Control Control::New(ControlBehaviour additionalBehaviour)
+{
   // Create the implementation, temporarily owned on stack
-  IntrusivePtr<Control> controlImpl = new Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) );
+  IntrusivePtr<Control> controlImpl = new Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT | additionalBehaviour));
 
   // Pass ownership to handle
-  Toolkit::Control handle( *controlImpl );
+  Toolkit::Control handle(*controlImpl);
 
   // Second-phase init of the implementation
   // This can only be done after the CustomActor connection has been made...
@@ -145,17 +106,17 @@ Toolkit::Control Control::New()
   return handle;
 }
 
-void Control::SetStyleName( const std::string& styleName )
+void Control::SetStyleName(const std::string& styleName)
 {
-  if( styleName != mImpl->mStyleName )
+  if(styleName != mImpl->mStyleName)
   {
     mImpl->mStyleName = styleName;
 
     // Apply new style, if stylemanager is available
     Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get();
-    if( styleManager )
+    if(styleManager)
     {
-      GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+      GetImpl(styleManager).ApplyThemeStyle(Toolkit::Control(GetOwner()));
     }
   }
 }
@@ -165,54 +126,32 @@ const std::string& Control::GetStyleName() const
   return mImpl->mStyleName;
 }
 
-void Control::SetBackgroundColor( const Vector4& color )
+void Control::SetBackgroundColor(const Vector4& color)
 {
   mImpl->mBackgroundColor = color;
 
   Property::Map map;
-  map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR;
-  map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color;
-
-  bool renderIfTransparent = false;
-  int clippingMode = ClippingMode::DISABLED;
-  if( ( Self().GetProperty( Actor::Property::CLIPPING_MODE ).Get( clippingMode ) ) &&
-      ( clippingMode == ClippingMode::CLIP_CHILDREN ) )
-  {
-    // If clipping-mode is set to CLIP_CHILDREN, then force visual to add the render even if transparent
-    map[ Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT ] = true;
-    renderIfTransparent = true;
-  }
+  map[Toolkit::Visual::Property::TYPE]           = Toolkit::Visual::COLOR;
+  map[Toolkit::ColorVisual::Property::MIX_COLOR] = color;
 
-  Toolkit::Visual::Base visual = mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND );
-  if( visual && visual.GetType() == Toolkit::Visual::COLOR )
+  Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND);
+  if(visual && visual.GetType() == Toolkit::Visual::COLOR)
   {
-    Property::Map visualMap;
-    visual.CreatePropertyMap( visualMap );
-
-    Property::Value* renderValue = visualMap.Find( Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT );
-    Property::Value* colorValue = visualMap.Find( Toolkit::ColorVisual::Property::MIX_COLOR );
-    if( renderValue && colorValue )
-    {
-      if( ( renderValue->Get< bool >() == true || colorValue->Get< Vector4 >().a > 0.0f )
-          && ( renderIfTransparent || color.a > 0.0f ) )
-      {
-        // Update background color only
-        mImpl->DoAction( Toolkit::Control::Property::BACKGROUND, DevelColorVisual::Action::UPDATE_PROPERTY, map );
-        return;
-      }
-    }
+    // Update background color only
+    mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelVisual::Action::UPDATE_PROPERTY, map);
+    return;
   }
 
-  SetBackground( map );
+  SetBackground(map);
 }
 
-void Control::SetBackground( const Property::Map& map )
+void Control::SetBackground(const Property::Map& map)
 {
-  Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map );
+  Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(map);
   visual.SetName("background");
-  if( visual )
+  if(visual)
   {
-    mImpl->RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND );
+    mImpl->RegisterVisual(Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND);
 
     // Trigger a size negotiation request that may be needed by the new visual to relayout its contents.
     RelayoutRequest();
@@ -221,37 +160,43 @@ void Control::SetBackground( const Property::Map& map )
 
 void Control::ClearBackground()
 {
-   mImpl->UnregisterVisual( Toolkit::Control::Property::BACKGROUND );
-   mImpl->mBackgroundColor = Color::TRANSPARENT;
+  mImpl->UnregisterVisual(Toolkit::Control::Property::BACKGROUND);
+  mImpl->mBackgroundColor = Color::TRANSPARENT;
+
+  // Trigger a size negotiation request that may be needed when unregistering a visual.
+  RelayoutRequest();
+}
 
-   // Trigger a size negotiation request that may be needed when unregistering a visual.
-   RelayoutRequest();
+Toolkit::DevelControl::ControlAccessible* Control::GetAccessibleObject()
+{
+  return mImpl->GetAccessibleObject();
 }
 
-void Control::EnableGestureDetection(Gesture::Type type)
+void Control::EnableGestureDetection(GestureType::Value type)
 {
-  if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector )
+  if((type & GestureType::PINCH) && !mImpl->mPinchGestureDetector)
   {
     mImpl->mPinchGestureDetector = PinchGestureDetector::New();
     mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected);
     mImpl->mPinchGestureDetector.Attach(Self());
   }
 
-  if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector )
+  if((type & GestureType::PAN) && !mImpl->mPanGestureDetector)
   {
     mImpl->mPanGestureDetector = PanGestureDetector::New();
+    mImpl->mPanGestureDetector.SetMaximumTouchesRequired(2);
     mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected);
     mImpl->mPanGestureDetector.Attach(Self());
   }
 
-  if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector )
+  if((type & GestureType::TAP) && !mImpl->mTapGestureDetector)
   {
     mImpl->mTapGestureDetector = TapGestureDetector::New();
     mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected);
     mImpl->mTapGestureDetector.Attach(Self());
   }
 
-  if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector )
+  if((type & GestureType::LONG_PRESS) && !mImpl->mLongPressGestureDetector)
   {
     mImpl->mLongPressGestureDetector = LongPressGestureDetector::New();
     mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected);
@@ -259,27 +204,27 @@ void Control::EnableGestureDetection(Gesture::Type type)
   }
 }
 
-void Control::DisableGestureDetection(Gesture::Type type)
+void Control::DisableGestureDetection(GestureType::Value type)
 {
-  if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector )
+  if((type & GestureType::PINCH) && mImpl->mPinchGestureDetector)
   {
     mImpl->mPinchGestureDetector.Detach(Self());
     mImpl->mPinchGestureDetector.Reset();
   }
 
-  if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector )
+  if((type & GestureType::PAN) && mImpl->mPanGestureDetector)
   {
     mImpl->mPanGestureDetector.Detach(Self());
     mImpl->mPanGestureDetector.Reset();
   }
 
-  if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector )
+  if((type & GestureType::TAP) && mImpl->mTapGestureDetector)
   {
     mImpl->mTapGestureDetector.Detach(Self());
     mImpl->mTapGestureDetector.Reset();
   }
 
-  if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector)
+  if((type & GestureType::LONG_PRESS) && mImpl->mLongPressGestureDetector)
   {
     mImpl->mLongPressGestureDetector.Detach(Self());
     mImpl->mLongPressGestureDetector.Reset();
@@ -318,7 +263,7 @@ bool Control::IsKeyboardNavigationSupported()
 
 void Control::SetKeyInputFocus()
 {
-  if( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+  if(Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
   {
     Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self()));
   }
@@ -327,10 +272,10 @@ void Control::SetKeyInputFocus()
 bool Control::HasKeyInputFocus()
 {
   bool result = false;
-  if( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+  if(Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
   {
     Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl();
-    if( Self() == control )
+    if(Self() == control)
     {
       result = true;
     }
@@ -340,7 +285,7 @@ bool Control::HasKeyInputFocus()
 
 void Control::ClearKeyInputFocus()
 {
-  if( Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+  if(Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
   {
     Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self()));
   }
@@ -373,7 +318,11 @@ void Control::KeyboardEnter()
 
 bool Control::OnAccessibilityActivated()
 {
-  return false; // Accessibility activation is not handled by default
+  if(Toolkit::KeyboardFocusManager::Get().SetCurrentFocusActor(Self()))
+  {
+    return OnKeyboardEnter();
+  }
+  return false;
 }
 
 bool Control::OnKeyboardEnter()
@@ -386,11 +335,6 @@ bool Control::OnAccessibilityPan(PanGesture gesture)
   return false; // Accessibility pan gesture is not handled by default
 }
 
-bool Control::OnAccessibilityTouch(const TouchData& touchData)
-{
-  return false; // Accessibility touch event is not handled by default
-}
-
 bool Control::OnAccessibilityValueChange(bool isIncrease)
 {
   return false; // Accessibility value change action is not handled by default
@@ -401,6 +345,11 @@ bool Control::OnAccessibilityZoom()
   return false; // Accessibility zoom action is not handled by default
 }
 
+DevelControl::ControlAccessible* Control::CreateAccessibleObject()
+{
+  return new DevelControl::ControlAccessible(Self());
+}
+
 Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled)
 {
   return Actor();
@@ -425,22 +374,22 @@ Toolkit::Control::KeyInputFocusSignalType& Control::KeyInputFocusLostSignal()
   return mImpl->mKeyInputFocusLostSignal;
 }
 
-bool Control::EmitKeyEventSignal( const KeyEvent& event )
+bool Control::EmitKeyEventSignal(const KeyEvent& event)
 {
   // Guard against destruction during signal emission
-  Dali::Toolkit::Control handle( GetOwner() );
+  Dali::Toolkit::Control handle(GetOwner());
 
   bool consumed = false;
 
-  consumed = mImpl->FilterKeyEvent( event );
+  consumed = mImpl->FilterKeyEvent(event);
 
   // signals are allocated dynamically when someone connects
-  if ( !consumed && !mImpl->mKeyEventSignal.Empty() )
+  if(!consumed && !mImpl->mKeyEventSignal.Empty())
   {
-    consumed = mImpl->mKeyEventSignal.Emit( handle, event );
+    consumed = mImpl->mKeyEventSignal.Emit(handle, event);
   }
 
-  if ( !consumed )
+  if(!consumed)
   {
     // Notification for derived classes
     consumed = OnKeyEvent(event);
@@ -449,8 +398,8 @@ bool Control::EmitKeyEventSignal( const KeyEvent& event )
   return consumed;
 }
 
-Control::Control( ControlBehaviour behaviourFlags )
-: CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ),
+Control::Control(ControlBehaviour behaviourFlags)
+: CustomActorImpl(static_cast<ActorFlags>(behaviourFlags)),
   mImpl(new Impl(*this))
 {
   mImpl->mFlags = behaviourFlags;
@@ -466,27 +415,34 @@ void Control::Initialize()
   // Call deriving classes so initialised before styling is applied to them.
   OnInitialize();
 
-  if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) ||
-      !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) )
+  if(!(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS))
   {
     Toolkit::StyleManager styleManager = StyleManager::Get();
 
     // if stylemanager is available
-    if( styleManager )
+    if(styleManager)
     {
-      StyleManager& styleManagerImpl = GetImpl( styleManager );
+      StyleManager& styleManagerImpl = GetImpl(styleManager);
 
       // Register for style changes
-      styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange );
+      styleManagerImpl.ControlStyleChangeSignal().Connect(this, &Control::OnStyleChange);
 
       // Apply the current style
-      styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) );
+      styleManagerImpl.ApplyThemeStyleAtInit(Toolkit::Control(GetOwner()));
     }
   }
 
-  if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT )
+  if(mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT)
   {
-    SetKeyboardNavigationSupport( true );
+    SetKeyboardNavigationSupport(true);
+  }
+
+  Dali::TypeInfo type;
+  Self().GetTypeInfo(type);
+  if(type)
+  {
+    auto typeName = type.GetName();
+    DevelControl::AppendAccessibilityAttribute(Toolkit::Control::DownCast(Self()), "class", typeName);
   }
 }
 
@@ -494,33 +450,33 @@ void Control::OnInitialize()
 {
 }
 
-void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change )
+void Control::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change)
 {
   // By default the control is only interested in theme (not font) changes
-  if( styleManager && change == StyleChange::THEME_CHANGE )
+  if(styleManager && change == StyleChange::THEME_CHANGE)
   {
-    GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+    GetImpl(styleManager).ApplyThemeStyle(Toolkit::Control(GetOwner()));
     RelayoutRequest();
   }
 }
 
 void Control::OnPinch(const PinchGesture& pinch)
 {
-  if( !( mImpl->mStartingPinchScale ) )
+  if(!(mImpl->mStartingPinchScale))
   {
     // lazy allocate
     mImpl->mStartingPinchScale = new Vector3;
   }
 
-  if( pinch.state == Gesture::Started )
+  if(pinch.GetState() == GestureState::STARTED)
   {
-    *( mImpl->mStartingPinchScale ) = Self().GetCurrentProperty< Vector3 >( Actor::Property::SCALE );
+    *(mImpl->mStartingPinchScale) = Self().GetCurrentProperty<Vector3>(Actor::Property::SCALE);
   }
 
-  Self().SetProperty( Actor::Property::SCALE, *( mImpl->mStartingPinchScale ) * pinch.scale );
+  Self().SetProperty(Actor::Property::SCALE, *(mImpl->mStartingPinchScale) * pinch.GetScale());
 }
 
-void Control::OnPan( const PanGesture& pan )
+void Control::OnPan(const PanGesture& pan)
 {
 }
 
@@ -528,56 +484,63 @@ void Control::OnTap(const TapGesture& tap)
 {
 }
 
-void Control::OnLongPress( const LongPressGesture& longPress )
+void Control::OnLongPress(const LongPressGesture& longPress)
 {
 }
 
-void Control::EmitKeyInputFocusSignal( bool focusGained )
+void Control::EmitKeyInputFocusSignal(bool focusGained)
 {
-  Dali::Toolkit::Control handle( GetOwner() );
+  Dali::Toolkit::Control handle(GetOwner());
 
-  if ( focusGained )
+  if(Accessibility::IsUp())
+  {
+    auto self = GetAccessibleObject();
+    self->EmitFocused(focusGained);
+    auto parent = self->GetParent();
+    if(parent && !self->GetStates()[Dali::Accessibility::State::MANAGES_DESCENDANTS])
+    {
+      parent->EmitActiveDescendantChanged(self);
+    }
+  }
+
+  if(focusGained)
   {
     // signals are allocated dynamically when someone connects
-    if ( !mImpl->mKeyInputFocusGainedSignal.Empty() )
+    if(!mImpl->mKeyInputFocusGainedSignal.Empty())
     {
-      mImpl->mKeyInputFocusGainedSignal.Emit( handle );
+      mImpl->mKeyInputFocusGainedSignal.Emit(handle);
     }
   }
   else
   {
     // signals are allocated dynamically when someone connects
-    if ( !mImpl->mKeyInputFocusLostSignal.Empty() )
+    if(!mImpl->mKeyInputFocusLostSignal.Empty())
     {
-      mImpl->mKeyInputFocusLostSignal.Emit( handle );
+      mImpl->mKeyInputFocusLostSignal.Emit(handle);
     }
   }
 }
 
-void Control::OnSceneConnection( int depth )
+void Control::OnSceneConnection(int depth)
 {
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnSceneConnection number of registered visuals(%d)\n",  mImpl->mVisuals.Size() );
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::OnSceneConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size());
 
-  Actor self( Self() );
+  Actor self(Self());
 
-  for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++)
+  for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter != mImpl->mVisuals.End(); iter++)
   {
     // Check whether the visual is empty and enabled
-    if( (*iter)->visual && (*iter)->enabled )
+    if((*iter)->visual && (*iter)->enabled)
     {
-      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnSceneConnection Setting visual(%d) on scene\n", (*iter)->index );
-      Toolkit::GetImplementation((*iter)->visual).SetOnScene( self );
+      DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::OnSceneConnection Setting visual(%d) on scene\n", (*iter)->index);
+      Toolkit::GetImplementation((*iter)->visual).SetOnScene(self);
     }
   }
 
   // The clipping renderer is only created if required.
-  CreateClippingRenderer( *this );
-
-  // Request to be laid out when the control is connected to the Scene.
-  // Signal that a Relayout may be needed
+  CreateClippingRenderer(*this);
 }
 
-
 void Control::OnSceneDisconnection()
 {
   mImpl->OnSceneDisconnection();
@@ -585,12 +548,12 @@ void Control::OnSceneDisconnection()
 
 void Control::OnKeyInputFocusGained()
 {
-  EmitKeyInputFocusSignal( true );
+  EmitKeyInputFocusSignal(true);
 }
 
 void Control::OnKeyInputFocusLost()
 {
-  EmitKeyInputFocusSignal( false );
+  EmitKeyInputFocusSignal(false);
 }
 
 void Control::OnChildAdd(Actor& child)
@@ -601,24 +564,60 @@ void Control::OnChildRemove(Actor& child)
 {
 }
 
-void Control::OnPropertySet( Property::Index index, Property::Value propertyValue )
+void Control::OnPropertySet(Property::Index index, const Property::Value& propertyValue)
 {
   // If the clipping mode has been set, we may need to create a renderer.
   // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls.
-  if( ( index == Actor::Property::CLIPPING_MODE ) && Self().GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) )
+  switch(index)
   {
-    // Note: This method will handle whether creation of the renderer is required.
-    CreateClippingRenderer( *this );
+    case Actor::Property::CLIPPING_MODE:
+    {
+      if(Self().GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE))
+      {
+        // Note: This method will handle whether creation of the renderer is required.
+        CreateClippingRenderer(*this);
+      }
+      break;
+    }
+    case Actor::Property::VISIBLE:
+    {
+      const bool visible = propertyValue.Get<bool>();
+      GetAccessibleObject()->EmitVisible(visible);
+      if(!visible)
+      {
+        Dali::Actor self = Self();
+        Dali::Actor actor = Dali::Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor();
+        while(actor)
+        {
+          if(self == actor)
+          {
+            Dali::Toolkit::KeyboardFocusManager::Get().ClearFocus();
+            break;
+          }
+          actor = actor.GetParent();
+        }
+      }
+      break;
+    }
+    case DevelActor::Property::USER_INTERACTION_ENABLED:
+    {
+      const bool enabled = propertyValue.Get<bool>();
+      if (!enabled && Self() == Dali::Toolkit::KeyboardFocusManager::Get().GetCurrentFocusActor())
+      {
+        Dali::Toolkit::KeyboardFocusManager::Get().ClearFocus();
+      }
+      break;
+    }
   }
 }
 
 void Control::OnSizeSet(const Vector3& targetSize)
 {
-  Toolkit::Visual::Base visual = mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND );
-  if( visual )
+  Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND);
+  if(visual)
   {
-    Vector2 size( targetSize );
-    visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform
+    Vector2 size(targetSize);
+    visual.SetTransformAndSize(Property::Map(), size); // Send an empty map as we do not want to modify the visual's set transform
   }
 }
 
@@ -627,133 +626,219 @@ void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
   // @todo size negotiate background to new size, animate as well?
 }
 
-bool Control::OnHoverEvent(const HoverEvent& event)
-{
-  return false; // Do not consume
-}
-
 bool Control::OnKeyEvent(const KeyEvent& event)
 {
   return false; // Do not consume
 }
 
-bool Control::OnWheelEvent(const WheelEvent& event)
+void Control::OnRelayout(const Vector2& size, RelayoutContainer& container)
 {
-  return false; // Do not consume
-}
-
-void Control::OnRelayout( const Vector2& size, RelayoutContainer& container )
-{
-  for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i )
+  for(unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i)
   {
-    Actor child = Self().GetChildAt( i );
-    Vector2 newChildSize( size );
+    Actor   child = Self().GetChildAt(i);
+    Vector2 newChildSize(size);
 
     // When set the padding or margin on the control, child should be resized and repositioned.
-    if( ( mImpl->mPadding.start != 0 ) || ( mImpl->mPadding.end != 0 ) || ( mImpl->mPadding.top != 0 ) || ( mImpl->mPadding.bottom != 0 ) ||
-        ( mImpl->mMargin.start != 0 ) || ( mImpl->mMargin.end != 0 ) || ( mImpl->mMargin.top != 0 ) || ( mImpl->mMargin.bottom != 0 ) )
+    if((mImpl->mPadding.start != 0) || (mImpl->mPadding.end != 0) || (mImpl->mPadding.top != 0) || (mImpl->mPadding.bottom != 0) ||
+       (mImpl->mMargin.start != 0) || (mImpl->mMargin.end != 0) || (mImpl->mMargin.top != 0) || (mImpl->mMargin.bottom != 0))
     {
       Extents padding = mImpl->mPadding;
 
-      Dali::CustomActor ownerActor(GetOwner());
-      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>( ownerActor.GetProperty( Dali::Actor::Property::LAYOUT_DIRECTION ).Get<int>() );
+      Dali::CustomActor           ownerActor(GetOwner());
+      Dali::LayoutDirection::Type layoutDirection = static_cast<Dali::LayoutDirection::Type>(ownerActor.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get<int>());
 
-      if( Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection )
+      if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection)
       {
-        std::swap( padding.start, padding.end );
+        std::swap(padding.start, padding.end);
       }
 
-      newChildSize.width = size.width - ( padding.start + padding.end );
-      newChildSize.height = size.height - ( padding.top + padding.bottom );
+      newChildSize.width  = size.width - (padding.start + padding.end);
+      newChildSize.height = size.height - (padding.top + padding.bottom);
 
       // Cannot use childs Position property as it can already have padding and margin applied on it,
       // so we end up cumulatively applying them over and over again.
-      Vector2 childOffset( 0.f, 0.f );
-      childOffset.x += ( mImpl->mMargin.start + padding.start );
-      childOffset.y += ( mImpl->mMargin.top + padding.top );
+      Vector2 childOffset(0.f, 0.f);
+      childOffset.x += (mImpl->mMargin.start + padding.start);
+      childOffset.y += (mImpl->mMargin.top + padding.top);
 
-      child.SetProperty( Actor::Property::POSITION, Vector2( childOffset.x, childOffset.y ) );
+      child.SetProperty(Actor::Property::POSITION, Vector2(childOffset.x, childOffset.y));
     }
-    container.Add( child, newChildSize );
+    container.Add(child, newChildSize);
   }
 
-  Toolkit::Visual::Base visual = mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND );
-  if( visual )
+  Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND);
+  if(visual)
   {
-    visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform
+    visual.SetTransformAndSize(Property::Map(), size); // Send an empty map as we do not want to modify the visual's set transform
   }
 }
 
-void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
+void Control::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension)
 {
 }
 
 Vector3 Control::GetNaturalSize()
 {
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::GetNaturalSize for %s\n", Self().GetProperty< std::string >( Dali::Actor::Property::NAME ).c_str() );
-  Toolkit::Visual::Base visual = mImpl->GetVisual( Toolkit::Control::Property::BACKGROUND );
-  if( visual )
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::GetNaturalSize for %s\n", Self().GetProperty<std::string>(Dali::Actor::Property::NAME).c_str());
+  Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND);
+  if(visual)
   {
     Vector2 naturalSize;
-    visual.GetNaturalSize( naturalSize );
-    naturalSize.width += ( mImpl->mPadding.start + mImpl->mPadding.end );
-    naturalSize.height += ( mImpl->mPadding.top + mImpl->mPadding.bottom );
-    return Vector3( naturalSize );
+    visual.GetNaturalSize(naturalSize);
+    naturalSize.width += (mImpl->mPadding.start + mImpl->mPadding.end);
+    naturalSize.height += (mImpl->mPadding.top + mImpl->mPadding.bottom);
+    return Vector3(naturalSize);
   }
   return Vector3::ZERO;
 }
 
-float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
+float Control::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension)
 {
-  return CalculateChildSizeBase( child, dimension );
+  return CalculateChildSizeBase(child, dimension);
 }
 
-float Control::GetHeightForWidth( float width )
+float Control::GetHeightForWidth(float width)
 {
-  return GetHeightForWidthBase( width );
+  return GetHeightForWidthBase(width);
 }
 
-float Control::GetWidthForHeight( float height )
+float Control::GetWidthForHeight(float height)
 {
-  return GetWidthForHeightBase( height );
+  return GetWidthForHeightBase(height);
 }
 
-bool Control::RelayoutDependentOnChildren( Dimension::Type dimension )
+bool Control::RelayoutDependentOnChildren(Dimension::Type dimension)
 {
-  return RelayoutDependentOnChildrenBase( dimension );
+  return RelayoutDependentOnChildrenBase(dimension);
 }
 
-void Control::OnCalculateRelayoutSize( Dimension::Type dimension )
+void Control::OnCalculateRelayoutSize(Dimension::Type dimension)
 {
 }
 
-void Control::OnLayoutNegotiated( float size, Dimension::Type dimension )
+void Control::OnLayoutNegotiated(float size, Dimension::Type dimension)
 {
 }
 
-void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalConnected(SlotObserver* slotObserver, CallbackBase* callback)
 {
-  mImpl->SignalConnected( slotObserver, callback );
+  mImpl->SignalConnected(slotObserver, callback);
 }
 
-void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalDisconnected(SlotObserver* slotObserver, CallbackBase* callback)
 {
-  mImpl->SignalDisconnected( slotObserver, callback );
+  mImpl->SignalDisconnected(slotObserver, callback);
+}
+
+void Control::MakeVisualTransition(Dali::Property::Map& sourcePropertyMap, Dali::Property::Map& destinationPropertyMap,
+                                   Dali::Toolkit::Control source, Dali::Toolkit::Control destination, Dali::Property::Index visualIndex)
+{
+  sourcePropertyMap.Clear();
+  destinationPropertyMap.Clear();
+
+  Toolkit::Visual::Base sourceVisual      = DevelControl::GetVisual(GetImplementation(source), visualIndex);
+  Toolkit::Visual::Base destinationVisual = DevelControl::GetVisual(GetImplementation(destination), visualIndex);
+
+  // If source or destination doesn't have the visual, do not create transition for the visual.
+  if(!sourceVisual || !destinationVisual)
+  {
+    return;
+  }
+
+  Property::Map sourceMap;
+  Property::Map destinationMap;
+  sourceVisual.CreatePropertyMap(sourceMap);
+  destinationVisual.CreatePropertyMap(destinationMap);
+
+  static auto findValueVector4 = [](const Property::Map& map, Property::Index index, const Vector4& defaultValue = Vector4()) -> Vector4
+  {
+    Property::Value* propertyValue = map.Find(index);
+    if(propertyValue)
+    {
+      return propertyValue->Get<Vector4>();
+    }
+    return defaultValue;
+  };
+
+  static auto findValueFloat = [](const Property::Map& map, Property::Index index, const float& defaultValue = 0.0f) -> float
+  {
+    Property::Value* propertyValue = map.Find(index);
+    if(propertyValue)
+    {
+      return propertyValue->Get<float>();
+    }
+    return defaultValue;
+  };
+
+  Vector4 defaultMixColor(Color::TRANSPARENT);
+  Vector4 defaultCornerRadius(0.0f, 0.0f, 0.0f, 0.0f);
+  float   defaultBorderlineWidth(0.0f);
+  Vector4 defaultBorderlineColor(0.0f, 0.0f, 0.0f, 1.0f);
+  float   defaultBorderlineOffset(0.0f);
+
+  Vector4 sourceMixColor         = findValueVector4(sourceMap, Dali::Toolkit::Visual::Property::MIX_COLOR, defaultMixColor);
+  Vector4 sourceCornerRadius     = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, defaultCornerRadius);
+  float   sourceBorderlineWidth  = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, defaultBorderlineWidth);
+  Vector4 sourceBorderlineColor  = findValueVector4(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, defaultBorderlineColor);
+  float   sourceBorderlineOffset = findValueFloat(sourceMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, defaultBorderlineOffset);
+
+  Vector4 destinationMixColor         = findValueVector4(destinationMap, Dali::Toolkit::Visual::Property::MIX_COLOR, defaultMixColor);
+  Vector4 destinationCornerRadius     = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::CORNER_RADIUS, defaultCornerRadius);
+  float   destinationBorderlineWidth  = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, defaultBorderlineWidth);
+  Vector4 destinationBorderlineColor  = findValueVector4(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_COLOR, defaultBorderlineColor);
+  float   destinationBorderlineOffset = findValueFloat(destinationMap, Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, defaultBorderlineOffset);
+
+  // If the value of the source Control and that of destination Control is different, the property should be transitioned.
+  if(Vector3(sourceMixColor) != Vector3(destinationMixColor))
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::Visual::Property::MIX_COLOR, Vector3(sourceMixColor));
+    destinationPropertyMap.Add(Dali::Toolkit::Visual::Property::MIX_COLOR, Vector3(destinationMixColor));
+  }
+
+  if(std::abs(sourceMixColor.a - destinationMixColor.a) > Math::MACHINE_EPSILON_1)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::Visual::Property::OPACITY, sourceMixColor.a);
+    destinationPropertyMap.Add(Dali::Toolkit::Visual::Property::OPACITY, destinationMixColor.a);
+  }
+
+  if(sourceCornerRadius != destinationCornerRadius)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS, sourceCornerRadius);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::CORNER_RADIUS, destinationCornerRadius);
+  }
+
+  if(sourceBorderlineWidth != destinationBorderlineWidth)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, sourceBorderlineWidth);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_WIDTH, destinationBorderlineWidth);
+  }
+
+  if(sourceBorderlineColor != destinationBorderlineColor)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR, sourceBorderlineColor);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_COLOR, destinationBorderlineColor);
+  }
+
+  if(sourceBorderlineOffset != destinationBorderlineOffset)
+  {
+    sourcePropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, sourceBorderlineOffset);
+    destinationPropertyMap.Add(Dali::Toolkit::DevelVisual::Property::BORDERLINE_OFFSET, destinationBorderlineOffset);
+  }
 }
 
-Control& GetImplementation( Dali::Toolkit::Control& handle )
+Control& GetImplementation(Dali::Toolkit::Control& handle)
 {
   CustomActorImpl& customInterface = handle.GetImplementation();
   // downcast to control
-  Control& impl = dynamic_cast< Internal::Control& >( customInterface );
+  Control& impl = dynamic_cast<Internal::Control&>(customInterface);
   return impl;
 }
 
-const Control& GetImplementation( const Dali::Toolkit::Control& handle )
+const Control& GetImplementation(const Dali::Toolkit::Control& handle)
 {
   const CustomActorImpl& customInterface = handle.GetImplementation();
   // downcast to control
-  const Control& impl = dynamic_cast< const Internal::Control& >( customInterface );
+  const Control& impl = dynamic_cast<const Internal::Control&>(customInterface);
   return impl;
 }