Peter M. Groen / dali-demo

Commit a30bcc247f2726235baaba0406f829ddf0815d91

Authored by Kimmo Hoikka
1 parent 8841ed7c

Changes following Allow background property to be set as a URL string 

Change-Id: Ia5f1554df7b053252e4185abda89d7dedc3d0d98
Inline Side-by-side
Showing 1 changed file with 2 additions and 6 deletions
examples/bubble-effect/bubble-effect-example.cpp
  View file @a30bcc2
@@ -140,9 +140,7 @@ private: @@ -140,9 +140,7 @@ private:
140 content.Add( bubbleRoot ); 140 content.Add( bubbleRoot );
141 141
142 // Set the application background 142 // Set the application background
143 - mBackground.SetProperty( Toolkit::Control::Property::BACKGROUND, Dali::Property::Map()  
144 - .Add( Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::IMAGE )  
145 - .Add( Dali::Toolkit::ImageVisual::Property::URL, BACKGROUND_IMAGES[mCurrentBackgroundImageId] )); 143 + mBackground.SetProperty( Toolkit::Control::Property::BACKGROUND, BACKGROUND_IMAGES[ mCurrentBackgroundImageId ] );
146 144
147 // Set up the timer to emit bubble regularly when the finger is touched down but not moved 145 // Set up the timer to emit bubble regularly when the finger is touched down but not moved
148 mTimerForBubbleEmission = Timer::New( mTimerInterval ); 146 mTimerForBubbleEmission = Timer::New( mTimerInterval );
@@ -258,9 +256,7 @@ private: @@ -258,9 +256,7 @@ private:
258 mBubbleEmitter.SetBackground( DemoHelper::LoadStageFillingTexture( BACKGROUND_IMAGES[ mCurrentBackgroundImageId ] ), mHSVDelta ); 256 mBubbleEmitter.SetBackground( DemoHelper::LoadStageFillingTexture( BACKGROUND_IMAGES[ mCurrentBackgroundImageId ] ), mHSVDelta );
259 257
260 // Set the application background 258 // Set the application background
261 - mBackground.SetProperty( Toolkit::Control::Property::BACKGROUND, Dali::Property::Map()  
262 - .Add( Dali::Toolkit::Visual::Property::TYPE, Dali::Toolkit::Visual::IMAGE )  
263 - .Add( Dali::Toolkit::ImageVisual::Property::URL, BACKGROUND_IMAGES[mCurrentBackgroundImageId] )); 259 + mBackground.SetProperty( Toolkit::Control::Property::BACKGROUND, BACKGROUND_IMAGES[ mCurrentBackgroundImageId ] );
264 } 260 }
265 else if( button == mChangeBubbleShapeButton ) 261 else if( button == mChangeBubbleShapeButton )
266 { 262 {