Commit 4cb9d1239419fb6ce68c50f3725800ca19c6de91
1 parent
ccd7fd46
Changes required after some Actor Devel APIs made public
Change-Id: I670cef9ae82d647a16f66cefe0abdf315916b29b
Showing
4 changed files
with
7 additions
and
7 deletions
examples/image-view-svg/image-view-svg-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2017 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -123,8 +123,8 @@ public: |
| 123 | 123 | mPinchGestureDetector.Attach( mStageBackground); |
| 124 | 124 | mPinchGestureDetector.DetectedSignal().Connect(this, &ImageSvgController::OnPinch); |
| 125 | 125 | |
| 126 | - DevelActor::RaiseToTop(changeButton); | |
| 127 | - DevelActor::RaiseToTop(resetButton); | |
| 126 | + changeButton.RaiseToTop(); | |
| 127 | + resetButton.RaiseToTop(); | |
| 128 | 128 | } |
| 129 | 129 | |
| 130 | 130 | // Callback of push button, for changing image set | ... | ... |
examples/pivot/pivot-example.cpp
| ... | ... | @@ -116,7 +116,7 @@ private: |
| 116 | 116 | void OnTap( Actor actor, const TapGesture& /* tap */ ) |
| 117 | 117 | { |
| 118 | 118 | // Raise the actor to the top. |
| 119 | - DevelActor::RaiseToTop( actor ); | |
| 119 | + actor.RaiseToTop(); | |
| 120 | 120 | |
| 121 | 121 | // Create the animation to rotate and scale our actor. |
| 122 | 122 | Animation animation = Animation::New( 1.0f ); | ... | ... |
examples/text-label/text-label-example.cpp
| 1 | 1 | /* |
| 2 | - * Copyright (c) 2016 Samsung Electronics Co., Ltd. | |
| 2 | + * Copyright (c) 2017 Samsung Electronics Co., Ltd. | |
| 3 | 3 | * |
| 4 | 4 | * Licensed under the Apache License, Version 2.0 (the "License"); |
| 5 | 5 | * you may not use this file except in compliance with the License. |
| ... | ... | @@ -238,7 +238,7 @@ public: |
| 238 | 238 | mContainer.Add( mBorder ); |
| 239 | 239 | mBorder.SetVisible(false); |
| 240 | 240 | |
| 241 | - DevelActor::RaiseToTop(mGrabCorner); | |
| 241 | + mGrabCorner.RaiseToTop(); | |
| 242 | 242 | |
| 243 | 243 | mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f ); |
| 244 | 244 | Renderer bgRenderer = mLabel.GetRendererAt(0); | ... | ... |
examples/text-overlap/text-overlap-example.cpp
| ... | ... | @@ -113,7 +113,7 @@ void TextOverlapController::Destroy( Application& app ) |
| 113 | 113 | bool TextOverlapController::OnClicked( Button button ) |
| 114 | 114 | { |
| 115 | 115 | mTopmostLabel = 1-mTopmostLabel; // toggles between 0 and 1 |
| 116 | - DevelActor::RaiseToTop(mLabels[mTopmostLabel]); | |
| 116 | + mLabels[mTopmostLabel].RaiseToTop(); | |
| 117 | 117 | return false; |
| 118 | 118 | } |
| 119 | 119 | ... | ... |