From: Ievgen Zaichuk <i.zaichuk@samsung.com>
Date: Mon, 3 Jun 2013 12:43:37 +0000 (+0300)
Subject: OnTouchCanceled() calling behaviour has been changed indirectly. effects-panel is... 
X-Git-Tag: 2.2_release~5
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=03e47b3882d51a72873d08bd491e9a69b79463e0;p=samples%2Fnative%2FEffectsApp.git

OnTouchCanceled() calling behaviour has been changed indirectly. effects-panel is moved over the draw-bitmap-panel

Change-Id: I19a74e3cd0ca8063c468741a13aa53cc311b7c6b
Signed-off-by: Ievgen Zaichuk <i.zaichuk@samsung.com>
---

diff --git a/project/src/EffectsBaseForm.cpp b/project/src/EffectsBaseForm.cpp
index 7e89321..c557928 100644
--- a/project/src/EffectsBaseForm.cpp
+++ b/project/src/EffectsBaseForm.cpp
@@ -84,13 +84,14 @@ EffectsBaseForm::OnInitializing(void)
 	Tizen::Graphics::Rectangle boundsForm(GetBounds());
 	Tizen::Graphics::Rectangle bounds(boundsForm.x, (boundsHeader.y + boundsHeader.height) * 0, boundsForm.width, boundsForm.height-(boundsHeader.y + boundsHeader.height + pFooter->GetBounds().height));
 	__pEffectsPanel->Construct(bounds);
+	__pEffectsPanel->SetShowState(false);
 
 	__pDrawBitmapPanel = new DrawPanel();
 	__pDrawBitmapPanel->Construct(bounds);
 	__pDrawBitmapPanel->AddTouchEventListener(*this);
 
-	AddControl(__pEffectsPanel);
 	AddControl(__pDrawBitmapPanel);
+	AddControl(__pEffectsPanel);
 
 	//Register effects:
 	InitializeEffect();
@@ -148,13 +149,13 @@ EffectsBaseForm::DeleteBitmaps()
 void
 EffectsBaseForm::OnEffectStarted(Effect& effect)
 {
-	__pDrawBitmapPanel->SetShowState(false);
+	__pEffectsPanel->SetShowState(true);
 }
 
 void
 EffectsBaseForm::OnEffectFinished(Effect& effect, EffectResult effectResult, const Tizen::Base::Collection::IList& lastShownBitmapIds)
 {
-	__pDrawBitmapPanel->SetShowState(true);
+	__pEffectsPanel->SetShowState(false);
 	SetBackgroundImage((dynamic_cast< const Tizen::Base::Long* >(lastShownBitmapIds.GetAt(0)))->value);
 }