Remove unnecessary use of ImageActor from bubble-demo

Change-Id: Iba0598878f2816bf2bce28c6daefb9d6ddca1140

diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp
index e34daa9..5e4e304 100644 (file)
--- a/examples/bubble-effect/bubble-effect-example.cpp
+++ b/examples/bubble-effect/bubble-effect-example.cpp
@@ -100,9 +100,8 @@ private:
     // Creates a default view with a default tool bar.
     // The view is added to the stage.
     Toolkit::ToolBar toolBar;
-    Toolkit::Control    view;
     Layer content = DemoHelper::CreateView( app,
-                                            view,
+                                            mBackground,
                                             toolBar,
                                             "",
                                             TOOLBAR_IMAGE,
@@ -140,15 +139,14 @@ private:
     content.Add( bubbleRoot );
 
     // Add the background image actor to stage
-    view.SetBackgroundImage( mBackgroundImage );
-    mBackgroundActor = ImageActor::DownCast( view.GetBackgroundActor() );
+    mBackground.SetBackgroundImage( mBackgroundImage );
 
     // Set up the timer to emit bubble regularly when the finger is touched down but not moved
     mTimerForBubbleEmission = Timer::New( mTimerInterval );
     mTimerForBubbleEmission.TickSignal().Connect(this, &BubbleEffectExample::OnTimerTick);
 
     // Connect the callback to the touch signal on the background
-    mBackgroundActor.TouchedSignal().Connect( this, &BubbleEffectExample::OnTouch );
+    mBackground.TouchedSignal().Connect( this, &BubbleEffectExample::OnTouch );
   }
 
 
@@ -255,7 +253,7 @@ private:
 
       mBubbleEmitter.SetBackground( mBackgroundImage, mHSVDelta );
 
-      mBackgroundActor.SetImage( mBackgroundImage );
+      mBackground.SetBackgroundImage( mBackgroundImage );
     }
     else if( button == mChangeBubbleShapeButton )
     {
@@ -282,7 +280,7 @@ private:
 
   Application&               mApp;
   Image                      mBackgroundImage;
-  ImageActor                 mBackgroundActor;
+  Dali::Toolkit::Control     mBackground;
 
   Toolkit::BubbleEmitter     mBubbleEmitter;
   Vector3                    mHSVDelta;