Commit b51c23b002d2e3686feb3c23a614a649fc058e7b
[dali_1.4.46] Merge branch 'devel/master'
Change-Id: I458e62d5dddf0b1f6a46e851454e59321564cdb1
Showing
3 changed files
with
4 additions
and
4 deletions
examples/text-scrolling/text-scrolling-example.cpp
| @@ -28,7 +28,7 @@ using namespace Dali::Toolkit; | @@ -28,7 +28,7 @@ using namespace Dali::Toolkit; | ||
| 28 | 28 | ||
| 29 | namespace | 29 | namespace |
| 30 | { | 30 | { |
| 31 | -const Vector2 DESKTOP_SIZE( Vector2( 1440.f, 1600.f ) ); | 31 | +const float STAGE_HEIGHT_MULTIPLIER( 1.5f ); |
| 32 | const Vector2 BOX_SIZE( Vector2(330.0f, 80.0f ) ); | 32 | const Vector2 BOX_SIZE( Vector2(330.0f, 80.0f ) ); |
| 33 | const Vector2 SCROLLING_BOX_SIZE( Vector2(330.0f, 40.0f ) ); | 33 | const Vector2 SCROLLING_BOX_SIZE( Vector2(330.0f, 40.0f ) ); |
| 34 | const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f; | 34 | const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f; |
| @@ -135,7 +135,7 @@ public: | @@ -135,7 +135,7 @@ public: | ||
| 135 | 135 | ||
| 136 | mAnimation = Animation::New( 1.0f ); | 136 | mAnimation = Animation::New( 1.0f ); |
| 137 | 137 | ||
| 138 | - const Size mTargetActorSize( mStageSize.width, DESKTOP_SIZE.height ); | 138 | + const Size mTargetActorSize( mStageSize.width, mStageSize.height * STAGE_HEIGHT_MULTIPLIER ); |
| 139 | 139 | ||
| 140 | // Create Desktop | 140 | // Create Desktop |
| 141 | Control desktop = Control::New(); | 141 | Control desktop = Control::New(); |
examples/transitions/shadow-button-impl.cpp
| @@ -423,7 +423,7 @@ void ShadowButton::StoreTargetLayouts( TransitionData transitionData ) | @@ -423,7 +423,7 @@ void ShadowButton::StoreTargetLayouts( TransitionData transitionData ) | ||
| 423 | if( target ) | 423 | if( target ) |
| 424 | { | 424 | { |
| 425 | // Convert to index | 425 | // Convert to index |
| 426 | - Property::Index index; | 426 | + Property::Index index = Property::INVALID_INDEX; |
| 427 | if( Scripting::GetEnumerationProperty( *target, VISUAL_PROPERTIES_TABLE, VISUAL_PROPERTIES_TABLE_COUNT, index ) ) | 427 | if( Scripting::GetEnumerationProperty( *target, VISUAL_PROPERTIES_TABLE, VISUAL_PROPERTIES_TABLE_COUNT, index ) ) |
| 428 | { | 428 | { |
| 429 | ShadowButton::Transforms::iterator iter = FindTransform( index ); | 429 | ShadowButton::Transforms::iterator iter = FindTransform( index ); |
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.4.45 | 5 | +Version: 1.4.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 |