From: Jiyun Yang Date: Tue, 24 Dec 2019 05:43:36 +0000 (+0900) Subject: Move shadow APIs to Internal::Control::Impl from Internal::Control X-Git-Tag: dali_1.4.52~2 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=1061baa5912952ac998c34584b1e2e5e030e0e5f;hp=3a205c679c52e3504cc9487d6a7d95e458c3539f Move shadow APIs to Internal::Control::Impl from Internal::Control Change-Id: I86bef469e54996bb83fddfa3b36d07970549d227 Signed-off-by: Jiyun Yang --- diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index fb42012..eb6285a 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -989,12 +989,12 @@ void Control::Impl::SetProperty( BaseObject* object, Property::Index index, cons const Property::Map* map = value.GetMap(); if( map && !map->Empty() ) { - controlImpl.SetShadow( *map ); + controlImpl.mImpl->SetShadow( *map ); } else { // The shadow is an empty property map, so we should clear the shadow - controlImpl.ClearShadow(); + controlImpl.mImpl->ClearShadow(); } break; } @@ -1429,6 +1429,27 @@ DevelControl::VisualEventSignalType& Control::Impl::VisualEventSignal() return mVisualEventSignal; } +void Control::Impl::SetShadow( const Property::Map& map ) +{ + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map ); + visual.SetName("shadow"); + + if( visual ) + { + mControlImpl.mImpl->RegisterVisual( Toolkit::DevelControl::Property::SHADOW, visual, DepthIndex::BACKGROUND_EFFECT ); + + mControlImpl.RelayoutRequest(); + } +} + +void Control::Impl::ClearShadow() +{ + mControlImpl.mImpl->UnregisterVisual( Toolkit::DevelControl::Property::SHADOW ); + + // Trigger a size negotiation request that may be needed when unregistering a visual. + mControlImpl.RelayoutRequest(); +} + } // namespace Internal } // namespace Toolkit diff --git a/dali-toolkit/internal/controls/control/control-data-impl.h b/dali-toolkit/internal/controls/control/control-data-impl.h index 370cf2e..210f6e2 100755 --- a/dali-toolkit/internal/controls/control/control-data-impl.h +++ b/dali-toolkit/internal/controls/control/control-data-impl.h @@ -336,6 +336,17 @@ public: */ DevelControl::VisualEventSignalType& VisualEventSignal(); + /** + * @brief Sets the shadow with a property map. + * @param[in] map The shadow property map + */ + void SetShadow(const Property::Map& map); + + /** + * @brief Clear the shadow. + */ + void ClearShadow(); + private: /** diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 46f24d8..c469d1c 100755 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -207,28 +207,6 @@ void Control::ClearBackground() RelayoutRequest(); } -void Control::SetShadow( const Property::Map& map ) -{ - Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map ); - visual.SetName("shadow"); - - if( visual ) - { - mImpl->RegisterVisual( Toolkit::DevelControl::Property::SHADOW, visual, DepthIndex::BACKGROUND_EFFECT ); - - RelayoutRequest(); - } -} - -void Control::ClearShadow() -{ - mImpl->UnregisterVisual( Toolkit::DevelControl::Property::SHADOW ); - - // Trigger a size negotiation request that may be needed when unregistering a visual. - RelayoutRequest(); -} - - void Control::EnableGestureDetection(Gesture::Type type) { if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) diff --git a/dali-toolkit/public-api/controls/control-impl.h b/dali-toolkit/public-api/controls/control-impl.h index 1e3110f..f2e4402 100644 --- a/dali-toolkit/public-api/controls/control-impl.h +++ b/dali-toolkit/public-api/controls/control-impl.h @@ -110,17 +110,6 @@ public: */ void ClearBackground(); - /** - * @brief Sets the shadow with a property map. - * @param[in] map The shadow property map - */ - void SetShadow(const Property::Map& map); - - /** - * @brief Clear the shadow. - */ - void ClearShadow(); - // Gesture Detection /**