Commit 0fd8cce1c91150048489f8bfbbc32c235e321143
[dali_1.0.29] Merge branch 'tizen'
Change-Id: I513288ceaad4861c8bb7396543d250d26968a441
Showing
2 changed files
with
1 additions
and
2 deletions
examples/magnifier/magnifier-example.cpp
| @@ -236,7 +236,6 @@ public: | @@ -236,7 +236,6 @@ public: | ||
| 236 | mMagnifier.SetSourceActor( mView.GetBackgroundLayer() ); | 236 | mMagnifier.SetSourceActor( mView.GetBackgroundLayer() ); |
| 237 | mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width | 237 | mMagnifier.SetSize( MAGNIFIER_SIZE * mStageSize.width ); // Size of magnifier is in relation to stage width |
| 238 | mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); | 238 | mMagnifier.SetMagnificationFactor( MAGNIFICATION_FACTOR ); |
| 239 | - mMagnifier.SetFrameVisibility(false); | ||
| 240 | mMagnifier.SetScale(Vector3::ZERO); | 239 | mMagnifier.SetScale(Vector3::ZERO); |
| 241 | overlay.Add( mMagnifier ); | 240 | overlay.Add( mMagnifier ); |
| 242 | 241 |
packaging/com.samsung.dali-demo.spec
| @@ -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.28 | 5 | +Version: 1.0.29 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |