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=9f48329fafeb1380cfeecbd8dff25d1937f65678;hb=refs%2Fchanges%2F85%2F237685%2F2;hp=d93e8806eefa57d106800ebd342e17e379531f3d;hpb=acbe10c62c46a30c58e08d8971a736f04e68dbf8;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 d93e880..9f48329 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,7 +21,8 @@ // EXTERNAL INCLUDES #include #include -#include +#include +#include #include // INTERNAL INCLUDES @@ -187,35 +188,6 @@ public: 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); - - /** * @brief Start rendering the GaussianBlurView. Must be called after you Add() it to the stage. * @SINCE_1_0.0 */ @@ -225,7 +197,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 */ @@ -249,7 +220,7 @@ public: * @param outputRenderTarget A render target to receive the blurred result. Passing NULL is allowed. See also GetBlurredRenderTarget(). * @pre This object was created with a New( ... ) call where the blurUserImage argument was set to true. If this was not the case an exception will be thrown. */ - void SetUserImageAndOutputRenderTarget(Image inputImage, FrameBufferImage outputRenderTarget); + void SetUserImageAndOutputRenderTarget(Dali::Texture inputImage, Dali::FrameBuffer outputRenderTarget); /** * @brief Get the index of the property that can be used to fade the blur in / out. @@ -271,7 +242,7 @@ public: * @return A handle on the blurred image, contained in a render target. * @pre The user must call Activate() before the render target will be returned. */ - FrameBufferImage GetBlurredRenderTarget() const; + Dali::FrameBuffer GetBlurredRenderTarget() const; /** * @brief Set background color for the view. The background will be filled with this color.