X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fdevel-api%2Fcontrols%2Fgaussian-blur-view%2Fgaussian-blur-view.h;h=3ebc35ad80dfcc7fcb9c19124a1c2f998af1ea13;hb=8a647e87a01c5c78451653c1264a9eea81ac9b20;hp=9b7824c39c4d5f62475289181ced6549fc62f14c;hpb=f7c8e7d9a0d3e179e4d9916d2ee11312c4911c1f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h index 9b7824c..3ebc35a 100644 --- a/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h +++ b/dali-toolkit/devel-api/controls/gaussian-blur-view/gaussian-blur-view.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_GAUSSIAN_BLUR_EFFECT_H /* - * Copyright (c) 2019 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. @@ -21,22 +21,19 @@ // EXTERNAL INCLUDES #include #include +#include #include #include -#include // INTERNAL INCLUDES #include namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { - /** * GaussianBlurView implementation class */ @@ -47,7 +44,7 @@ class GaussianBlurView; */ class BloomView; -} // namespace Internal +} // namespace DALI_INTERNAL /** * @addtogroup dali_toolkit_controls_gaussian_blur_view * @{ @@ -111,7 +108,7 @@ public: * @brief Signal type for notifications * @SINCE_1_0.0 */ - typedef Signal< void (GaussianBlurView source) > GaussianBlurViewSignal; + typedef Signal GaussianBlurViewSignal; /** * @brief Create an uninitialized GaussianBlurView; this can be initialized with GaussianBlurView::New(). @@ -149,7 +146,7 @@ public: * @param[in] handle Handle to an object * @return A handle to a GaussianBlurView or an uninitialized handle */ - static GaussianBlurView DownCast( BaseHandle handle ); + static GaussianBlurView DownCast(BaseHandle handle); /** * @brief Create an initialized GaussianBlurView, using default settings. The default settings are:-\n @@ -183,38 +180,7 @@ public: * SetUserImageAndOutputRenderTarget(). * @return A handle to a newly allocated Dali resource */ - static GaussianBlurView New(const unsigned int numSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat, - const float downsampleWidthScale, const float downsampleHeightScale, - bool blurUserImage = false); - - /** - * @DEPRECATED_1_1.28 Use Actor::Add(Actor) instead - * @brief Adds a child Actor to this Actor. - * @SINCE_1_0.0 - * @param [in] child The child. - * @pre This Actor (the parent) has been initialized. - * @pre The child actor has been initialized. - * @pre The child actor is not the same as the parent actor. - * @pre The actor is not the Root actor - * @post The child will be referenced by its parent. This means that the child will be kept alive, - * even if the handle passed into this method is reset or destroyed. - * @note If the child already has a parent, it will be removed from old parent - * and reparented to this actor. This may change childs position, color, shader effect, - * scale etc as it now inherits them from this actor. - */ - void Add(Actor child); - - /** - * @DEPRECATED_1_1.28 Use Actor::Remove(Actor) instead - * @brief Removes a child Actor from this Actor. - * - * If the actor was not a child of this actor, this is a no-op. - * @SINCE_1_0.0 - * @param [in] child The child. - * @pre This Actor (the parent) has been initialized. - * @pre The child actor is not the same as the parent actor. - */ - void Remove(Actor child); + static GaussianBlurView New(const unsigned int numSamples, const float blurBellCurveWidth, const Pixel::Format renderTargetPixelFormat, const float downsampleWidthScale, const float downsampleHeightScale, bool blurUserImage = false); /** * @brief Start rendering the GaussianBlurView. Must be called after you Add() it to the stage. @@ -226,7 +192,6 @@ public: * @brief Render the GaussianBlurView once. * * Must be called after you Add() it to the stage. - * Only works with a gaussian blur view created with blurUserImage = true. * Listen to the Finished signal to determine when the rendering has completed. * @SINCE_1_0.0 */ @@ -279,7 +244,7 @@ public: * @SINCE_1_0.0 * @param[in] color The background color. */ - void SetBackgroundColor( const Vector4& color ); + void SetBackgroundColor(const Vector4& color); /** * @brief Get the background color. @@ -298,23 +263,21 @@ public: // Signals GaussianBlurViewSignal& FinishedSignal(); public: - /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. * @SINCE_1_0.0 * @param[in] implementation The UI Control implementation. */ - DALI_INTERNAL GaussianBlurView( Internal::GaussianBlurView& implementation ); + DALI_INTERNAL GaussianBlurView(Internal::GaussianBlurView& implementation); /** * @brief Allows the creation of this UI Control from an Internal::CustomActor pointer. * @SINCE_1_0.0 * @param[in] internal A pointer to the internal CustomActor. */ - DALI_INTERNAL GaussianBlurView( Dali::Internal::CustomActor* internal ); + DALI_INTERNAL GaussianBlurView(Dali::Internal::CustomActor* internal); /// @endcond - }; /**