Commit 9e2bbf21d3595e38f59e3cdd723f2598d7f80efa
[dali_1.0.46] Merge branch 'devel/master'
Change-Id: I84b588ac741620f9c1796a1c68016ffafaf88fc8
Showing
2 changed files
with
5 additions
and
5 deletions
examples/magnifier/magnifier-example.cpp
| ... | ... | @@ -225,7 +225,7 @@ public: |
| 225 | 225 | mMagnifier = Toolkit::Magnifier::New(); |
| 226 | 226 | mMagnifier.SetSourceActor( mView.GetChildAt( 0 ) ); |
| 227 | 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 | 229 | mMagnifier.SetScale(Vector3::ZERO); |
| 230 | 230 | overlay.Add( mMagnifier ); |
| 231 | 231 | |
| ... | ... | @@ -242,7 +242,7 @@ public: |
| 242 | 242 | mBouncingMagnifier = Toolkit::Magnifier::New(); |
| 243 | 243 | mBouncingMagnifier.SetSourceActor( mView.GetChildAt( 0 ) ); |
| 244 | 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 | 246 | overlay.Add( mBouncingMagnifier ); |
| 247 | 247 | |
| 248 | 248 | mAnimationTimeProperty = mBouncingMagnifier.RegisterProperty("animation-time", 0.0f); |
| ... | ... | @@ -255,7 +255,7 @@ public: |
| 255 | 255 | constraint.Apply(); |
| 256 | 256 | |
| 257 | 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 | 259 | constraint.AddSource( LocalSource(Actor::Property::SIZE) ); |
| 260 | 260 | constraint.AddSource( LocalSource(mAnimationTimeProperty) ); |
| 261 | 261 | constraint.Apply(); |
| ... | ... | @@ -368,7 +368,7 @@ public: |
| 368 | 368 | */ |
| 369 | 369 | void SetMagnifierPosition(const Vector3 position) |
| 370 | 370 | { |
| 371 | - mMagnifier.SetSourcePosition( position ); | |
| 371 | + mMagnifier.SetProperty( Toolkit::Magnifier::Property::SOURCE_POSITION, position ); | |
| 372 | 372 | |
| 373 | 373 | // position magnifier glass such that bottom edge is touching/near top of finger. |
| 374 | 374 | Vector3 glassPosition(position); | ... | ... |