projects
/
platform
/
core
/
uifw
/
dali-core.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "DALi Version 1.9.35" into devel/master
[platform/core/uifw/dali-core.git]
/
dali
/
public-api
/
actors
/
actor.cpp
diff --git
a/dali/public-api/actors/actor.cpp
b/dali/public-api/actors/actor.cpp
index
6df6576
..
0b455bd
100644
(file)
--- a/
dali/public-api/actors/actor.cpp
+++ b/
dali/public-api/actors/actor.cpp
@@
-27,16
+27,13
@@
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/actors/layer-impl.h>
#include <dali/internal/event/actors/actor-impl.h>
#include <dali/internal/event/actors/layer-impl.h>
-#include <dali/internal/event/rendering/renderer-impl.h>
#include <dali/internal/event/animation/constraint-impl.h>
#include <dali/internal/event/animation/constraint-impl.h>
+#include <dali/internal/event/rendering/renderer-impl.h>
#include <dali/internal/event/size-negotiation/relayout-controller-impl.h>
namespace Dali
{
#include <dali/internal/event/size-negotiation/relayout-controller-impl.h>
namespace Dali
{
-
-Actor::Actor()
-{
-}
+Actor::Actor() = default;
Actor Actor::New()
{
Actor Actor::New()
{
@@
-45,29
+42,20
@@
Actor Actor::New()
return Actor(internal.Get());
}
return Actor(internal.Get());
}
-Actor Actor::DownCast(
BaseHandle handle
)
+Actor Actor::DownCast(
BaseHandle handle
)
{
{
- return Actor(
dynamic_cast<Dali::Internal::Actor*>(handle.GetObjectPtr())
);
+ return Actor(
dynamic_cast<Dali::Internal::Actor*>(handle.GetObjectPtr())
);
}
}
-Actor::~Actor()
-{
-}
+Actor::~Actor() = default;
-Actor::Actor(const Actor& copy)
-: Handle(copy)
-{
-}
+Actor::Actor(const Actor& copy) = default;
-Actor& Actor::operator=(const Actor& rhs)
-{
- BaseHandle::operator=(rhs);
- return *this;
-}
+Actor& Actor::operator=(const Actor& rhs) = default;
-Actor::Actor(
Actor&& rhs
) = default;
+Actor::Actor(
Actor&& rhs
) = default;
-Actor& Actor::operator=(
Actor&& rhs
) = default;
+Actor& Actor::operator=(
Actor&& rhs
) = default;
Layer Actor::GetLayer()
{
Layer Actor::GetLayer()
{
@@
-94,22
+82,22
@@
uint32_t Actor::GetChildCount() const
return GetImplementation(*this).GetChildCount();
}
return GetImplementation(*this).GetChildCount();
}
-Actor Actor::GetChildAt(
uint32_t index
) const
+Actor Actor::GetChildAt(
uint32_t index
) const
{
{
- Internal::ActorPtr child = GetImplementation(*this).GetChildAt(
index
);
- return Actor(
child.Get()
);
+ Internal::ActorPtr child = GetImplementation(*this).GetChildAt(
index
);
+ return Actor(
child.Get()
);
}
Actor Actor::FindChildByName(const std::string& actorName)
{
}
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 uint32_t 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
}
Actor Actor::GetParent() const
@@
-156,71
+144,64
@@
bool Actor::ScreenToLocal(float& localX, float& localY, float screenX, float scr
void Actor::Raise()
{
void Actor::Raise()
{
- GetImplementation(
*this
).Raise();
+ GetImplementation(
*this
).Raise();
}
void Actor::Lower()
{
}
void Actor::Lower()
{
- GetImplementation(
*this
).Lower();
+ GetImplementation(
*this
).Lower();
}
void Actor::RaiseToTop()
{
}
void Actor::RaiseToTop()
{
- GetImplementation(
*this
).RaiseToTop();
+ GetImplementation(
*this
).RaiseToTop();
}
void Actor::LowerToBottom()
{
}
void Actor::LowerToBottom()
{
- GetImplementation(
*this
).LowerToBottom();
+ GetImplementation(
*this
).LowerToBottom();
}
}
-void Actor::RaiseAbove(
Actor target
)
+void Actor::RaiseAbove(
Actor target
)
{
{
- GetImplementation(
*this ).RaiseAbove( GetImplementation( target )
);
+ GetImplementation(
*this).RaiseAbove(GetImplementation(target)
);
}
}
-void Actor::LowerBelow(
Actor target
)
+void Actor::LowerBelow(
Actor target
)
{
{
- GetImplementation(
*this ).LowerBelow( GetImplementation( target )
);
+ GetImplementation(
*this).LowerBelow(GetImplementation(target)
);
}
}
-void Actor::SetResizePolicy(
ResizePolicy::Type policy, Dimension::Type dimension
)
+void Actor::SetResizePolicy(
ResizePolicy::Type policy, Dimension::Type dimension
)
{
{
- GetImplementation(*this).SetResizePolicy(
policy, dimension
);
+ GetImplementation(*this).SetResizePolicy(
policy, dimension
);
}
}
-ResizePolicy::Type Actor::GetResizePolicy(
Dimension::Type dimension
) const
+ResizePolicy::Type Actor::GetResizePolicy(
Dimension::Type dimension
) const
{
{
- return GetImplementation(*this).GetResizePolicy(
dimension
);
+ return GetImplementation(*this).GetResizePolicy(
dimension
);
}
}
-float Actor::GetHeightForWidth(
float width
)
+float Actor::GetHeightForWidth(
float width
)
{
{
- return GetImplementation(*this).GetHeightForWidth(
width
);
+ return GetImplementation(*this).GetHeightForWidth(
width
);
}
}
-float Actor::GetWidthForHeight(
float height
)
+float Actor::GetWidthForHeight(
float height
)
{
{
- return GetImplementation(*this).GetWidthForHeight(
height
);
+ return GetImplementation(*this).GetWidthForHeight(
height
);
}
}
-float Actor::GetRelayoutSize(
Dimension::Type dimension
) const
+float Actor::GetRelayoutSize(
Dimension::Type dimension
) const
{
{
- return GetImplementation(*this).GetRelayoutSize(
dimension
);
+ return GetImplementation(*this).GetRelayoutSize(
dimension
);
}
}
-Actor::TouchSignalType& Actor::TouchedSignal()
+Actor::Touch
Event
SignalType& Actor::TouchedSignal()
{
{
- DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: TouchedSignal() is deprecated and will be removed from next release. Use TouchSignal() instead.\n" );
-
return GetImplementation(*this).TouchedSignal();
}
return GetImplementation(*this).TouchedSignal();
}
-Actor::TouchDataSignalType& Actor::TouchSignal()
-{
- return GetImplementation( *this ).TouchSignal();
-}
-
Actor::HoverSignalType& Actor::HoveredSignal()
{
return GetImplementation(*this).HoveredSignal();
Actor::HoverSignalType& Actor::HoveredSignal()
{
return GetImplementation(*this).HoveredSignal();
@@
-231,19
+212,19
@@
Actor::WheelEventSignalType& Actor::WheelEventSignal()
return GetImplementation(*this).WheelEventSignal();
}
return GetImplementation(*this).WheelEventSignal();
}
-Actor::OnS
tageSignalType& Actor::OnStag
eSignal()
+Actor::OnS
ceneSignalType& Actor::OnScen
eSignal()
{
{
- return GetImplementation(*this).OnS
tag
eSignal();
+ return GetImplementation(*this).OnS
cen
eSignal();
}
}
-Actor::OffS
tageSignalType& Actor::OffStag
eSignal()
+Actor::OffS
ceneSignalType& Actor::OffScen
eSignal()
{
{
- return GetImplementation(*this).OffS
tag
eSignal();
+ return GetImplementation(*this).OffS
cen
eSignal();
}
}
-uint32_t Actor::AddRenderer(
Renderer& renderer
)
+uint32_t Actor::AddRenderer(
Renderer& renderer
)
{
{
- return GetImplementation(*this).AddRenderer(
GetImplementation( renderer )
);
+ return GetImplementation(*this).AddRenderer(
GetImplementation(renderer)
);
}
uint32_t Actor::GetRendererCount() const
}
uint32_t Actor::GetRendererCount() const
@@
-251,20
+232,20
@@
uint32_t Actor::GetRendererCount() const
return GetImplementation(*this).GetRendererCount();
}
return GetImplementation(*this).GetRendererCount();
}
-Renderer Actor::GetRendererAt(
uint32_t index
)
+Renderer Actor::GetRendererAt(
uint32_t index
)
{
{
- Internal::RendererPtr renderer = GetImplementation(*this).GetRendererAt(
index
);
- return Renderer(
renderer.Get()
);
+ Internal::RendererPtr renderer = GetImplementation(*this).GetRendererAt(
index
);
+ return Renderer(
renderer.Get()
);
}
}
-void Actor::RemoveRenderer(
Renderer& renderer
)
+void Actor::RemoveRenderer(
Renderer& renderer
)
{
{
- GetImplementation(*this).RemoveRenderer(
GetImplementation( renderer )
);
+ GetImplementation(*this).RemoveRenderer(
GetImplementation(renderer)
);
}
}
-void Actor::RemoveRenderer(
uint32_t index
)
+void Actor::RemoveRenderer(
uint32_t index
)
{
{
- GetImplementation(*this).RemoveRenderer(
index
);
+ GetImplementation(*this).RemoveRenderer(
index
);
}
Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal()
}
Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal()
@@
-274,7
+255,7
@@
Actor::OnRelayoutSignalType& Actor::OnRelayoutSignal()
Actor::LayoutDirectionChangedSignalType& Actor::LayoutDirectionChangedSignal()
{
Actor::LayoutDirectionChangedSignalType& Actor::LayoutDirectionChangedSignal()
{
- return GetImplementation(
*this
).LayoutDirectionChangedSignal();
+ return GetImplementation(
*this
).LayoutDirectionChangedSignal();
}
Actor::Actor(Internal::Actor* internal)
}
Actor::Actor(Internal::Actor* internal)