Commit 2a6ce411fd881c7b21f0f5dcef39c93105151b8f
[dali_1.3.43] Merge branch 'devel/master'
Change-Id: Ia7756a5a96032447e214cbaf75f3806afc487ece
Showing
3 changed files
with
12 additions
and
5 deletions
examples/pre-render-callback/pre-render-callback-example.cpp
| @@ -50,7 +50,15 @@ public: | @@ -50,7 +50,15 @@ public: | ||
| 50 | mTapDetector(), | 50 | mTapDetector(), |
| 51 | mKeepPreRender(false), | 51 | mKeepPreRender(false), |
| 52 | mRotateTextCharacter(0), | 52 | mRotateTextCharacter(0), |
| 53 | - mLastRTC(-1) | 53 | + mLastRTC(-1), |
| 54 | + mImageActor1(), | ||
| 55 | + mImageActor2(), | ||
| 56 | + mImageActor3(), | ||
| 57 | + mAngle1Index( Property::INVALID_INDEX ), | ||
| 58 | + mAngle3Index( Property::INVALID_INDEX ), | ||
| 59 | + mSceneActor(), | ||
| 60 | + mSceneAnimation(), | ||
| 61 | + mSpinner() | ||
| 54 | { | 62 | { |
| 55 | // Connect to the Application's Init signal | 63 | // Connect to the Application's Init signal |
| 56 | mApplication.InitSignal().Connect( this, &PreRenderCallbackController::Create ); | 64 | mApplication.InitSignal().Connect( this, &PreRenderCallbackController::Create ); |
examples/simple-layout/custom-layout-impl.cpp
| @@ -66,8 +66,7 @@ void CustomLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, | @@ -66,8 +66,7 @@ void CustomLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, | ||
| 66 | LayoutLength childLeft( 0 ); | 66 | LayoutLength childLeft( 0 ); |
| 67 | 67 | ||
| 68 | // We want to vertically align the children to the middle | 68 | // We want to vertically align the children to the middle |
| 69 | - LayoutLength height = bottom - top; | ||
| 70 | - LayoutLength middle = height / 2; | 69 | + LayoutLength middle = (bottom - top) / 2; |
| 71 | 70 | ||
| 72 | // Horizontally align the children to the middle of the space they are given too | 71 | // Horizontally align the children to the middle of the space they are given too |
| 73 | LayoutLength width = right - left; | 72 | LayoutLength width = right - left; |
| @@ -90,7 +89,7 @@ void CustomLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, | @@ -90,7 +89,7 @@ void CustomLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, | ||
| 90 | LayoutLength childWidth = childLayout->GetMeasuredWidth(); | 89 | LayoutLength childWidth = childLayout->GetMeasuredWidth(); |
| 91 | LayoutLength childHeight = childLayout->GetMeasuredHeight(); | 90 | LayoutLength childHeight = childLayout->GetMeasuredHeight(); |
| 92 | 91 | ||
| 93 | - childTop = middle - (childHeight / 2); | 92 | + childTop = middle - childHeight / 2; |
| 94 | 93 | ||
| 95 | LayoutLength left = childLeft + center - childWidth / 2; | 94 | LayoutLength left = childLeft + center - childWidth / 2; |
| 96 | 95 |
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.3.42 | 5 | +Version: 1.3.43 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |