X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Factors%2Factor.cpp;h=cf897e9d126d61e5b3e5a1043288bec7f8349c28;hb=513a1a599fead5c2328900f0ac846adfb7bf0cbc;hp=1fd4d43565c62db3c4ec0d16ac46de957de9a358;hpb=0cd1506a8e484fc79b5cc157232479e216885362;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/dali/public-api/actors/actor.cpp b/dali/public-api/actors/actor.cpp
index 1fd4d43..cf897e9 100644
--- a/dali/public-api/actors/actor.cpp
+++ b/dali/public-api/actors/actor.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 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.
@@ -27,7 +27,7 @@
 
 #include <dali/internal/event/actors/actor-impl.h>
 #include <dali/internal/event/actors/layer-impl.h>
-#include <dali/internal/event/actor-attachments/actor-attachment-impl.h>
+#include <dali/internal/event/rendering/renderer-impl.h>
 #include <dali/internal/event/animation/constraint-impl.h>
 #include <dali/internal/event/size-negotiation/relayout-controller-impl.h>
 
@@ -65,36 +65,6 @@ Actor& Actor::operator=(const Actor& rhs)
   return *this;
 }
 
-const std::string& Actor::GetName() const
-{
-  return GetImplementation(*this).GetName();
-}
-
-void Actor::SetName(const std::string& name)
-{
-  GetImplementation(*this).SetName(name);
-}
-
-unsigned int Actor::GetId() const
-{
-  return GetImplementation(*this).GetId();
-}
-
-bool Actor::IsRoot() const
-{
-  return GetImplementation(*this).IsRoot();
-}
-
-bool Actor::OnStage() const
-{
-  return GetImplementation(*this).OnStage();
-}
-
-bool Actor::IsLayer() const
-{
-  return GetImplementation(*this).IsLayer();
-}
-
 Layer Actor::GetLayer()
 {
   return GetImplementation(*this).GetLayer();
@@ -105,11 +75,6 @@ void Actor::Add(Actor actor)
   GetImplementation(*this).Add(GetImplementation(actor));
 }
 
-void Actor::Insert(unsigned int index, Actor actor)
-{
-  GetImplementation(*this).Insert(index, GetImplementation(actor));
-}
-
 void Actor::Remove(Actor actor)
 {
   GetImplementation(*this).Remove(GetImplementation(actor));
@@ -120,26 +85,27 @@ void Actor::Unparent()
   GetImplementation(*this).Unparent();
 }
 
-unsigned int Actor::GetChildCount() const
+uint32_t Actor::GetChildCount() const
 {
   return GetImplementation(*this).GetChildCount();
 }
 
-Actor Actor::GetChildAt(unsigned int index) const
+Actor Actor::GetChildAt( uint32_t index ) const
 {
-  return GetImplementation(*this).GetChildAt(index);
+  Internal::ActorPtr child = GetImplementation(*this).GetChildAt( index );
+  return Actor( child.Get() );
 }
 
 Actor Actor::FindChildByName(const std::string& actorName)
 {
-  Internal::ActorPtr child = GetImplementation(*this).FindChildByName(actorName);
-  return Actor(child.Get());
+  Internal::ActorPtr child = GetImplementation(*this).FindChildByName( actorName );
+  return Actor( child.Get() );
 }
 
-Actor Actor::FindChildById(const unsigned int id)
+Actor Actor::FindChildById( const uint32_t id )
 {
-  Internal::ActorPtr child = GetImplementation(*this).FindChildById(id);
-  return Actor(child.Get());
+  Internal::ActorPtr child = GetImplementation(*this).FindChildById( id );
+  return Actor( child.Get() );
 }
 
 Actor Actor::GetParent() const
@@ -149,126 +115,21 @@ Actor Actor::GetParent() const
   return Actor(parent);
 }
 
-void Actor::SetParentOrigin(const Vector3& origin)
-{
-  GetImplementation(*this).SetParentOrigin(origin);
-}
-
-Vector3 Actor::GetCurrentParentOrigin() const
-{
-  return GetImplementation(*this).GetCurrentParentOrigin();
-}
-
-void Actor::SetAnchorPoint(const Vector3& anchorPoint)
-{
-  GetImplementation(*this).SetAnchorPoint(anchorPoint);
-}
-
-Vector3 Actor::GetCurrentAnchorPoint() const
-{
-  return GetImplementation(*this).GetCurrentAnchorPoint();
-}
-
-void Actor::SetSize(float width, float height)
-{
-  GetImplementation(*this).SetSize(width, height);
-}
-
-void Actor::SetSize(float width, float height, float depth)
-{
-  GetImplementation(*this).SetSize(width, height, depth);
-}
-
-void Actor::SetSize(const Vector2& size)
-{
-  GetImplementation(*this).SetSize( size );
-}
-
-void Actor::SetSize(const Vector3& size)
-{
-  GetImplementation(*this).SetSize( size );
-}
-
 Vector3 Actor::GetTargetSize() const
 {
   return GetImplementation(*this).GetTargetSize();
 }
 
-Vector3 Actor::GetCurrentSize() const
-{
-  return GetImplementation(*this).GetCurrentSize();
-}
-
 Vector3 Actor::GetNaturalSize() const
 {
   return GetImplementation(*this).GetNaturalSize();
 }
 
-void Actor::SetPosition(float x, float y)
-{
-  GetImplementation(*this).SetPosition(x, y);
-}
-
-void Actor::SetPosition(float x, float y, float z)
-{
-  GetImplementation(*this).SetPosition(x, y, z);
-}
-
-void Actor::SetPosition(const Vector3& position)
-{
-  GetImplementation(*this).SetPosition(position);
-}
-
-void Actor::SetX(float x)
-{
-  GetImplementation(*this).SetX(x);
-}
-
-void Actor::SetY(float y)
-{
-  GetImplementation(*this).SetY(y);
-}
-
-void Actor::SetZ(float z)
-{
-  GetImplementation(*this).SetZ(z);
-}
-
 void Actor::TranslateBy(const Vector3& distance)
 {
   GetImplementation(*this).TranslateBy(distance);
 }
 
-Vector3 Actor::GetCurrentPosition() const
-{
-  return GetImplementation(*this).GetCurrentPosition();
-}
-
-Vector3 Actor::GetCurrentWorldPosition() const
-{
-  return GetImplementation(*this).GetCurrentWorldPosition();
-}
-
-void Actor::SetPositionInheritanceMode( PositionInheritanceMode mode )
-{
-  GetImplementation(*this).SetPositionInheritanceMode( mode );
-}
-
-PositionInheritanceMode Actor::GetPositionInheritanceMode() const
-{
-  return GetImplementation(*this).GetPositionInheritanceMode();
-}
-
-void Actor::SetOrientation(const Radian& angle, const Vector3& axis)
-{
-  GetImplementation(*this).SetOrientation(angle, axis);
-}
-
-void Actor::SetOrientation(const Quaternion& orientation)
-{
-  GetImplementation(*this).SetOrientation(orientation);
-}
-
 void Actor::RotateBy(const Radian& angle, const Vector3& axis)
 {
   GetImplementation(*this).RotateBy(angle, axis);
@@ -279,169 +140,44 @@ void Actor::RotateBy(const Quaternion& relativeRotation)
   GetImplementation(*this).RotateBy(relativeRotation);
 }
 
-Quaternion Actor::GetCurrentOrientation() const
-{
-  return GetImplementation(*this).GetCurrentOrientation();
-}
-
-void Actor::SetInheritOrientation(bool inherit)
-{
-  GetImplementation(*this).SetInheritOrientation(inherit);
-}
-
-bool Actor::IsOrientationInherited() const
-{
-  return GetImplementation(*this).IsOrientationInherited();
-}
-
-Quaternion Actor::GetCurrentWorldOrientation() const
-{
-  return GetImplementation(*this).GetCurrentWorldOrientation();
-}
-
-void Actor::SetScale(float scale)
-{
-  GetImplementation(*this).SetScale(scale);
-}
-
-void Actor::SetScale(float scaleX, float scaleY, float scaleZ)
-{
-  GetImplementation(*this).SetScale(scaleX, scaleY, scaleZ);
-}
-
-void Actor::SetScale(const Vector3& scale)
-{
-  GetImplementation(*this).SetScale(scale);
-}
-
 void Actor::ScaleBy(const Vector3& relativeScale)
 {
   GetImplementation(*this).ScaleBy(relativeScale);
 }
 
-Vector3 Actor::GetCurrentScale() const
-{
-  return GetImplementation(*this).GetCurrentScale();
-}
-
-Vector3 Actor::GetCurrentWorldScale() const
-{
-  return GetImplementation(*this).GetCurrentWorldScale();
-}
-
-void Actor::SetInheritScale( bool inherit )
-{
-  GetImplementation(*this).SetInheritScale( inherit );
-}
-
-bool Actor::IsScaleInherited() const
-{
-  return GetImplementation(*this).IsScaleInherited();
-}
-
-void Actor::SetSizeModeFactor(const Vector3& factor)
-{
-  GetImplementation(*this).SetSizeModeFactor(factor);
-}
-
-Vector3 Actor::GetSizeModeFactor() const
-{
-  return GetImplementation(*this).GetSizeModeFactor();
-}
-
-Matrix Actor::GetCurrentWorldMatrix() const
-{
-  return GetImplementation(*this).GetCurrentWorldMatrix();
-}
-
-void Actor::SetVisible(bool visible)
-{
-  GetImplementation(*this).SetVisible(visible);
-}
-
-bool Actor::IsVisible() const
-{
-  return GetImplementation(*this).IsVisible();
-}
-
-void Actor::SetOpacity(float opacity)
-{
-  GetImplementation(*this).SetOpacity(opacity);
-}
-
-float Actor::GetCurrentOpacity() const
-{
-  return GetImplementation(*this).GetCurrentOpacity();
-}
-
-void Actor::SetColor(const Vector4& color)
-{
-  GetImplementation(*this).SetColor(color);
-}
-
-Vector4 Actor::GetCurrentColor() const
-{
-  return GetImplementation(*this).GetCurrentColor();
-}
-
-void Actor::SetColorMode( ColorMode colorMode )
-{
-  GetImplementation(*this).SetColorMode(colorMode);
-}
-
-ColorMode Actor::GetColorMode() const
-{
-  return GetImplementation(*this).GetColorMode();
-}
-
-Vector4 Actor::GetCurrentWorldColor() const
-{
-  return GetImplementation(*this).GetCurrentWorldColor();
-}
-
-void Actor::SetDrawMode( DrawMode::Type drawMode )
-{
-  GetImplementation(*this).SetDrawMode( drawMode );
-}
-
-DrawMode::Type Actor::GetDrawMode() const
-{
-  return GetImplementation(*this).GetDrawMode();
-}
-
-void Actor::SetSensitive(bool sensitive)
+bool Actor::ScreenToLocal(float& localX, float& localY, float screenX, float screenY) const
 {
-  GetImplementation(*this).SetSensitive(sensitive);
+  return GetImplementation(*this).ScreenToLocal(localX, localY, screenX, screenY);
 }
 
-bool Actor::IsSensitive() const
+void Actor::Raise()
 {
-  return GetImplementation(*this).IsSensitive();
+  GetImplementation( *this ).Raise();
 }
 
-bool Actor::ScreenToLocal(float& localX, float& localY, float screenX, float screenY) const
+void Actor::Lower()
 {
-  return GetImplementation(*this).ScreenToLocal(localX, localY, screenX, screenY);
+  GetImplementation( *this ).Lower();
 }
 
-void Actor::SetLeaveRequired(bool required)
+void Actor::RaiseToTop()
 {
-  GetImplementation(*this).SetLeaveRequired(required);
+  GetImplementation( *this ).RaiseToTop();
 }
 
-bool Actor::GetLeaveRequired() const
+void Actor::LowerToBottom()
 {
-  return GetImplementation(*this).GetLeaveRequired();
+  GetImplementation( *this ).LowerToBottom();
 }
 
-void Actor::SetKeyboardFocusable( bool focusable )
+void Actor::RaiseAbove( Actor target )
 {
-  GetImplementation(*this).SetKeyboardFocusable(focusable);
+  GetImplementation( *this ).RaiseAbove( GetImplementation( target ) );
 }
 
-bool Actor::IsKeyboardFocusable() const
+void Actor::LowerBelow( Actor target )
 {
-  return GetImplementation(*this).IsKeyboardFocusable();
+  GetImplementation( *this ).LowerBelow( GetImplementation( target ) );
 }
 
 void Actor::SetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
@@ -454,16 +190,6 @@ ResizePolicy::Type Actor::GetResizePolicy( Dimension::Type dimension ) const
   return GetImplementation(*this).GetResizePolicy( dimension );
 }
 
-void Actor::SetSizeScalePolicy( SizeScalePolicy::Type policy )
-{
-  GetImplementation(*this).SetSizeScalePolicy( policy );
-}
-
-SizeScalePolicy::Type Actor::GetSizeScalePolicy() const
-{
-  return GetImplementation(*this).GetSizeScalePolicy();
-}
-
 float Actor::GetHeightForWidth( float width )
 {
   return GetImplementation(*this).GetHeightForWidth( width );
@@ -479,88 +205,62 @@ float Actor::GetRelayoutSize( Dimension::Type dimension ) const
   return GetImplementation(*this).GetRelayoutSize( dimension );
 }
 
-void Actor::PropagateRelayoutFlags()
-{
-  GetImplementation(*this).PropagateRelayoutFlags();
-}
-
-void Actor::SetPadding( const Padding& padding )
+Actor::TouchSignalType& Actor::TouchedSignal()
 {
-  Internal::Actor& impl = GetImplementation(*this);
-
-  Vector2 widthPadding( padding.left, padding.right );
-  impl.SetPadding( widthPadding, Dimension::WIDTH );
+  DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
 
-  Vector2 heightPadding( padding.bottom, padding.top );
-  impl.SetPadding( heightPadding, Dimension::HEIGHT );
+  return GetImplementation(*this).TouchedSignal();
 }
 
-void Actor::GetPadding( Padding& paddingOut ) const
+Actor::TouchDataSignalType& Actor::TouchSignal()
 {
-  const Internal::Actor& impl = GetImplementation(*this);
-
-  Vector2 widthPadding = impl.GetPadding( Dimension::WIDTH );
-  Vector2 heightPadding = impl.GetPadding( Dimension::HEIGHT );
-
-  paddingOut.left = widthPadding.x;
-  paddingOut.right = widthPadding.y;
-  paddingOut.bottom = heightPadding.x;
-  paddingOut.top = heightPadding.y;
+  return GetImplementation( *this ).TouchSignal();
 }
 
-void Actor::SetMinimumSize( const Vector2& size )
+Actor::HoverSignalType& Actor::HoveredSignal()
 {
-  Internal::Actor& impl = GetImplementation(*this);
-
-  impl.SetMinimumSize( size.x, Dimension::WIDTH );
-  impl.SetMinimumSize( size.y, Dimension::HEIGHT );
+  return GetImplementation(*this).HoveredSignal();
 }
 
-Vector2 Actor::GetMinimumSize()
+Actor::WheelEventSignalType& Actor::WheelEventSignal()
 {
-  Internal::Actor& impl = GetImplementation(*this);
-
-  return Vector2( impl.GetMinimumSize( Dimension::WIDTH ), impl.GetMinimumSize( Dimension::HEIGHT ) );
+  return GetImplementation(*this).WheelEventSignal();
 }
 
-void Actor::SetMaximumSize( const Vector2& size )
+Actor::OnStageSignalType& Actor::OnStageSignal()
 {
-  Internal::Actor& impl = GetImplementation(*this);
-
-  impl.SetMaximumSize( size.x, Dimension::WIDTH );
-  impl.SetMaximumSize( size.y, Dimension::HEIGHT );
+  return GetImplementation(*this).OnStageSignal();
 }
 
-Vector2 Actor::GetMaximumSize()
+Actor::OffStageSignalType& Actor::OffStageSignal()
 {
-  Internal::Actor& impl = GetImplementation(*this);
-
-  return Vector2( impl.GetMaximumSize( Dimension::WIDTH ), impl.GetMaximumSize( Dimension::HEIGHT ) );
+  return GetImplementation(*this).OffStageSignal();
 }
 
-Actor::TouchSignalType& Actor::TouchedSignal()
+uint32_t Actor::AddRenderer( Renderer& renderer )
 {
-  return GetImplementation(*this).TouchedSignal();
+  return GetImplementation(*this).AddRenderer( GetImplementation( renderer ) );
 }
 
-Actor::HoverSignalType& Actor::HoveredSignal()
+uint32_t Actor::GetRendererCount() const
 {
-  return GetImplementation(*this).HoveredSignal();
+  return GetImplementation(*this).GetRendererCount();
 }
 
-Actor::MouseWheelEventSignalType& Actor::MouseWheelEventSignal()
+Renderer Actor::GetRendererAt( uint32_t index )
 {
-  return GetImplementation(*this).MouseWheelEventSignal();
+  Internal::RendererPtr renderer = GetImplementation(*this).GetRendererAt( index );
+  return Renderer( renderer.Get() );
 }
 
-Actor::OnStageSignalType& Actor::OnStageSignal()
+void Actor::RemoveRenderer( Renderer& renderer )
 {
-  return GetImplementation(*this).OnStageSignal();
+  GetImplementation(*this).RemoveRenderer( GetImplementation( renderer ) );
 }
 
-Actor::OffStageSignalType& Actor::OffStageSignal()
+void Actor::RemoveRenderer( uint32_t index )
 {
-  return GetImplementation(*this).OffStageSignal();
+  GetImplementation(*this).RemoveRenderer( index );
 }
 
 Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal()
@@ -568,18 +268,14 @@ Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal()
   return GetImplementation(*this).OnRelayoutSignal();
 }
 
-Actor::Actor(Internal::Actor* internal)
-: Handle(internal)
+Actor::LayoutDirectionChangedSignalType& Actor::LayoutDirectionChangedSignal()
 {
+  return GetImplementation( *this ).LayoutDirectionChangedSignal();
 }
 
-void UnparentAndReset( Actor& actor )
+Actor::Actor(Internal::Actor* internal)
+: Handle(internal)
 {
-  if( actor )
-  {
-    actor.Unparent();
-    actor.Reset();
-  }
 }
 
 } // namespace Dali