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 | 50 | mTapDetector(), |
| 51 | 51 | mKeepPreRender(false), |
| 52 | 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 | 63 | // Connect to the Application's Init signal |
| 56 | 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 | 66 | LayoutLength childLeft( 0 ); |
| 67 | 67 | |
| 68 | 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 | 71 | // Horizontally align the children to the middle of the space they are given too |
| 73 | 72 | LayoutLength width = right - left; |
| ... | ... | @@ -90,7 +89,7 @@ void CustomLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, |
| 90 | 89 | LayoutLength childWidth = childLayout->GetMeasuredWidth(); |
| 91 | 90 | LayoutLength childHeight = childLayout->GetMeasuredHeight(); |
| 92 | 91 | |
| 93 | - childTop = middle - (childHeight / 2); | |
| 92 | + childTop = middle - childHeight / 2; | |
| 94 | 93 | |
| 95 | 94 | LayoutLength left = childLeft + center - childWidth / 2; |
| 96 | 95 | ... | ... |