X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Factors%2Flayer.cpp;h=3da33655effd5078bdaa4087509c2becf85df6fd;hb=f24c14c80919972c2f41235f0ed5989d776b14a1;hp=300ee693a76fb1a5615500015e3c0b94f3b2b291;hpb=a86ae47738c5baf9707e366912e1f52dbba39129;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/public-api/actors/layer.cpp b/dali/public-api/actors/layer.cpp index 300ee69..3da3365 100644 --- a/dali/public-api/actors/layer.cpp +++ b/dali/public-api/actors/layer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 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. @@ -20,11 +20,9 @@ // INTERNAL INCLUDES #include -#include namespace Dali { - using Dali::Layer; Layer::Layer() @@ -38,30 +36,22 @@ Layer Layer::New() return Layer(internal.Get()); } -Layer Layer::DownCast( BaseHandle handle ) +Layer Layer::DownCast(BaseHandle handle) { - return Layer( dynamic_cast(handle.GetObjectPtr()) ); + return Layer(dynamic_cast(handle.GetObjectPtr())); } Layer::~Layer() { } -Layer::Layer(const Layer& copy) -: Actor(copy) -{ -} +Layer::Layer(const Layer& copy) = default; -Layer& Layer::operator=(const Layer& rhs) -{ - BaseHandle::operator=(rhs); - return *this; -} +Layer& Layer::operator=(const Layer& rhs) = default; -unsigned int Layer::GetDepth() const -{ - return GetImplementation(*this).GetDepth(); -} +Layer::Layer(Layer&& rhs) = default; + +Layer& Layer::operator=(Layer&& rhs) = default; void Layer::Raise() { @@ -73,14 +63,14 @@ void Layer::Lower() GetImplementation(*this).Lower(); } -void Layer::RaiseAbove( Layer target ) +void Layer::RaiseAbove(Layer target) { - GetImplementation(*this).RaiseAbove( GetImplementation( target ) ); + GetImplementation(*this).RaiseAbove(GetImplementation(target)); } -void Layer::LowerBelow( Layer target ) +void Layer::LowerBelow(Layer target) { - GetImplementation(*this).LowerBelow( GetImplementation( target ) ); + GetImplementation(*this).LowerBelow(GetImplementation(target)); } void Layer::RaiseToTop() @@ -93,49 +83,14 @@ void Layer::LowerToBottom() GetImplementation(*this).LowerToBottom(); } -void Layer::MoveAbove( Layer target ) -{ - GetImplementation(*this).MoveAbove( GetImplementation( target ) ); -} - -void Layer::MoveBelow( Layer target ) +void Layer::MoveAbove(Layer target) { - GetImplementation(*this).MoveBelow( GetImplementation( target ) ); + GetImplementation(*this).MoveAbove(GetImplementation(target)); } -void Layer::SetClipping(bool enabled) +void Layer::MoveBelow(Layer target) { - GetImplementation(*this).SetClipping(enabled); -} - -bool Layer::IsClipping() const -{ - return GetImplementation(*this).IsClipping(); -} - -void Layer::SetClippingBox(int x, int y, int width, int height) -{ - GetImplementation(*this).SetClippingBox(x, y, width, height); -} - -void Layer::SetClippingBox(ClippingBox box) -{ - GetImplementation(*this).SetClippingBox(box.x, box.y, box.width, box.height); -} - -ClippingBox Layer::GetClippingBox() const -{ - return GetImplementation(*this).GetClippingBox(); -} - -void Layer::SetDepthTestDisabled( bool disable ) -{ - GetImplementation(*this).SetDepthTestDisabled( disable ); -} - -bool Layer::IsDepthTestDisabled() const -{ - return GetImplementation(*this).IsDepthTestDisabled(); + GetImplementation(*this).MoveBelow(GetImplementation(target)); } void Layer::SetSortFunction(SortFunctionType function) @@ -143,26 +98,6 @@ void Layer::SetSortFunction(SortFunctionType function) GetImplementation(*this).SetSortFunction(function); } -void Layer::SetTouchConsumed( bool consume ) -{ - GetImplementation( *this ).SetTouchConsumed( consume ); -} - -bool Layer::IsTouchConsumed() const -{ - return GetImplementation( *this ).IsTouchConsumed(); -} - -void Layer::SetHoverConsumed( bool consume ) -{ - GetImplementation( *this ).SetHoverConsumed( consume ); -} - -bool Layer::IsHoverConsumed() const -{ - return GetImplementation( *this ).IsHoverConsumed(); -} - Layer::Layer(Internal::Layer* internal) : Actor(internal) {