From 3b814d1a154260d5d83923ec3b876aac095eee94 Mon Sep 17 00:00:00 2001 From: Heeyong Song Date: Wed, 15 Nov 2017 17:30:46 +0900 Subject: [PATCH] Fix BloomView bug Reset child controls when BloomView is deactivated Change-Id: Ifc1a1ab5fe3991344f58c25c8488ea51f375f8be --- dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp index 1a1f9f0..c05e954 100644 --- a/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp +++ b/dali-toolkit/internal/controls/bloom-view/bloom-view-impl.cpp @@ -358,6 +358,7 @@ void BloomView::AllocateResources() mGaussianBlurView.SetSize(mTargetSize); GetImpl(mGaussianBlurView).AllocateResources(); + mGaussianBlurView.SetVisible( true ); ////////////////////////////////////////////////////// // Create render targets @@ -458,9 +459,18 @@ void BloomView::Deactivate() // stop render tasks processing // Note: render target resources are automatically freed since we set the Image::Unused flag RemoveRenderTasks(); + mRenderTargetForRenderingChildren.Reset(); mBloomExtractTarget.Reset(); mOutputRenderTarget.Reset(); + + // Reset children + mBloomExtractImageView.SetImage( "" ); + mTargetImageView.SetImage( "" ); + mCompositeImageView.SetImage( "" ); + + mGaussianBlurView.SetVisible( false ); + mActivated = false; } -- 2.7.4