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 | 28 | |
| 29 | 29 | namespace |
| 30 | 30 | { |
| 31 | -const Vector2 DESKTOP_SIZE( Vector2( 1440.f, 1600.f ) ); | |
| 31 | +const float STAGE_HEIGHT_MULTIPLIER( 1.5f ); | |
| 32 | 32 | const Vector2 BOX_SIZE( Vector2(330.0f, 80.0f ) ); |
| 33 | 33 | const Vector2 SCROLLING_BOX_SIZE( Vector2(330.0f, 40.0f ) ); |
| 34 | 34 | const float MAX_OFFSCREEN_RENDERING_SIZE = 2048.f; |
| ... | ... | @@ -135,7 +135,7 @@ public: |
| 135 | 135 | |
| 136 | 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 | 140 | // Create Desktop |
| 141 | 141 | Control desktop = Control::New(); | ... | ... |
examples/transitions/shadow-button-impl.cpp
| ... | ... | @@ -423,7 +423,7 @@ void ShadowButton::StoreTargetLayouts( TransitionData transitionData ) |
| 423 | 423 | if( target ) |
| 424 | 424 | { |
| 425 | 425 | // Convert to index |
| 426 | - Property::Index index; | |
| 426 | + Property::Index index = Property::INVALID_INDEX; | |
| 427 | 427 | if( Scripting::GetEnumerationProperty( *target, VISUAL_PROPERTIES_TABLE, VISUAL_PROPERTIES_TABLE_COUNT, index ) ) |
| 428 | 428 | { |
| 429 | 429 | ShadowButton::Transforms::iterator iter = FindTransform( index ); | ... | ... |