From 4cb9d1239419fb6ce68c50f3725800ca19c6de91 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 29 Sep 2017 18:51:31 +0100 Subject: [PATCH] Changes required after some Actor Devel APIs made public Change-Id: I670cef9ae82d647a16f66cefe0abdf315916b29b --- examples/image-view-svg/image-view-svg-example.cpp | 6 +++--- examples/pivot/pivot-example.cpp | 2 +- examples/text-label/text-label-example.cpp | 4 ++-- examples/text-overlap/text-overlap-example.cpp | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/examples/image-view-svg/image-view-svg-example.cpp b/examples/image-view-svg/image-view-svg-example.cpp index a264ca5..fa89c05 100644 --- a/examples/image-view-svg/image-view-svg-example.cpp +++ b/examples/image-view-svg/image-view-svg-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -123,8 +123,8 @@ public: mPinchGestureDetector.Attach( mStageBackground); mPinchGestureDetector.DetectedSignal().Connect(this, &ImageSvgController::OnPinch); - DevelActor::RaiseToTop(changeButton); - DevelActor::RaiseToTop(resetButton); + changeButton.RaiseToTop(); + resetButton.RaiseToTop(); } // Callback of push button, for changing image set diff --git a/examples/pivot/pivot-example.cpp b/examples/pivot/pivot-example.cpp index 9ea5f47..fe62dcf 100644 --- a/examples/pivot/pivot-example.cpp +++ b/examples/pivot/pivot-example.cpp @@ -116,7 +116,7 @@ private: void OnTap( Actor actor, const TapGesture& /* tap */ ) { // Raise the actor to the top. - DevelActor::RaiseToTop( actor ); + actor.RaiseToTop(); // Create the animation to rotate and scale our actor. Animation animation = Animation::New( 1.0f ); diff --git a/examples/text-label/text-label-example.cpp b/examples/text-label/text-label-example.cpp index f2b0802..d3218a6 100644 --- a/examples/text-label/text-label-example.cpp +++ b/examples/text-label/text-label-example.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -238,7 +238,7 @@ public: mContainer.Add( mBorder ); mBorder.SetVisible(false); - DevelActor::RaiseToTop(mGrabCorner); + mGrabCorner.RaiseToTop(); mHueAngleIndex = mLabel.RegisterProperty( "hue", 0.0f ); Renderer bgRenderer = mLabel.GetRendererAt(0); diff --git a/examples/text-overlap/text-overlap-example.cpp b/examples/text-overlap/text-overlap-example.cpp index 560ebe0..f5609bd 100644 --- a/examples/text-overlap/text-overlap-example.cpp +++ b/examples/text-overlap/text-overlap-example.cpp @@ -113,7 +113,7 @@ void TextOverlapController::Destroy( Application& app ) bool TextOverlapController::OnClicked( Button button ) { mTopmostLabel = 1-mTopmostLabel; // toggles between 0 and 1 - DevelActor::RaiseToTop(mLabels[mTopmostLabel]); + mLabels[mTopmostLabel].RaiseToTop(); return false; } -- 2.7.4