Peter M. Groen / dali-demo

Commit 9e2bbf21d3595e38f59e3cdd723f2598d7f80efa

Authored by Chu Hoang
2 parents 3c6c1b26 004186ee

[dali_1.0.46] Merge branch 'devel/master' 

Change-Id: I84b588ac741620f9c1796a1c68016ffafaf88fc8
Inline Side-by-side
Showing 2 changed files with 5 additions and 5 deletions
examples/magnifier/magnifier-example.cpp
  View file @9e2bbf2
@@ -225,7 +225,7 @@ public: @@ -225,7 +225,7 @@ public:
225 mMagnifier = Toolkit::Magnifier::New(); 225 mMagnifier = Toolkit::Magnifier::New();
226 mMagnifier.SetSourceActor( mView.GetChildAt( 0 ) ); 226 mMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
227 mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width 227 mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
228 - mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); 228 + mMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
229 mMagnifier.SetScale(Vector3::ZERO); 229 mMagnifier.SetScale(Vector3::ZERO);
230 overlay.Add( mMagnifier ); 230 overlay.Add( mMagnifier );
231 231
@@ -242,7 +242,7 @@ public: @@ -242,7 +242,7 @@ public:
242 mBouncingMagnifier = Toolkit::Magnifier::New(); 242 mBouncingMagnifier = Toolkit::Magnifier::New();
243 mBouncingMagnifier.SetSourceActor( mView.GetChildAt( 0 ) ); 243 mBouncingMagnifier.SetSourceActor( mView.GetChildAt( 0 ) );
244 mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width 244 mBouncingMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width
245 - mBouncingMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); 245 + mBouncingMagnifier.SetProperty( Toolkit::Magnifier::Property::MAGNIFICATION_FACTOR, MAGNIFICATION_FACTOR );
246 overlay.Add( mBouncingMagnifier ); 246 overlay.Add( mBouncingMagnifier );
247 247
248 mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f); 248 mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f);
@@ -255,7 +255,7 @@ public: @@ -255,7 +255,7 @@ public:
255 constraint.Apply(); 255 constraint.Apply();
256 256
257 // Apply constraint to animate the source of the magnifier. 257 // Apply constraint to animate the source of the magnifier.
258 - constraint = Constraint::New<Vector3>( mBouncingMagnifier, mBouncingMagnifier.GetPropertyIndex( Toolkit::Magnifier::SOURCE_POSITION_PROPERTY_NAME ), MagnifierPathConstraint(mStageSize) ); 258 + constraint = Constraint::New<Vector3>( mBouncingMagnifier, Toolkit::Magnifier::Property::SOURCE_POSITION, MagnifierPathConstraint(mStageSize) );
259 constraint.AddSource( LocalSource(Actor::Property::SIZE) ); 259 constraint.AddSource( LocalSource(Actor::Property::SIZE) );
260 constraint.AddSource( LocalSource(mAnimationTimeProperty) ); 260 constraint.AddSource( LocalSource(mAnimationTimeProperty) );
261 constraint.Apply(); 261 constraint.Apply();
@@ -368,7 +368,7 @@ public: @@ -368,7 +368,7 @@ public:
368 */ 368 */
369 void SetMagnifierPosition(const Vector3 position) 369 void SetMagnifierPosition(const Vector3 position)
370 { 370 {
371 - mMagnifier.SetSourcePosition( position ); 371 + mMagnifier.SetProperty( Toolkit::Magnifier::Property::SOURCE_POSITION, position );
372 372
373 // position magnifier glass such that bottom edge is touching/near top of finger. 373 // position magnifier glass such that bottom edge is touching/near top of finger.
374 Vector3 glassPosition(position); 374 Vector3 glassPosition(position);
packaging/com.samsung.dali-demo.spec
  View file @9e2bbf2
@@ -2,7 +2,7 @@ @@ -2,7 +2,7 @@
2 2
3 Name: com.samsung.dali-demo 3 Name: com.samsung.dali-demo
4 Summary: The OpenGLES Canvas Core Demo 4 Summary: The OpenGLES Canvas Core Demo
5 -Version: 1.0.45 5 +Version: 1.0.46
6 Release: 1 6 Release: 1
7 Group: System/Libraries 7 Group: System/Libraries
8 License: Apache-2.0 8 License: Apache-2.0