projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Support Right-To-Left of padding/margin in imageView" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
bloom-view
/
bloom-view-impl.cpp
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
(file)
--- 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.SetSize(mTargetSize);
GetImpl(mGaussianBlurView).AllocateResources();
+ mGaussianBlurView.SetVisible( true );
//////////////////////////////////////////////////////
// Create render targets
//////////////////////////////////////////////////////
// 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();
// 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();
mRenderTargetForRenderingChildren.Reset();
mBloomExtractTarget.Reset();
mOutputRenderTarget.Reset();
+
+ // Reset children
+ mBloomExtractImageView.SetImage( "" );
+ mTargetImageView.SetImage( "" );
+ mCompositeImageView.SetImage( "" );
+
+ mGaussianBlurView.SetVisible( false );
+
mActivated = false;
}
mActivated = false;
}