From f894a972336a954d02f8312e42a63d3bcf12792a Mon Sep 17 00:00:00 2001 From: Richard Underhill Date: Wed, 24 Jun 2015 11:52:35 +0100 Subject: [PATCH] Removed DepthIndex methods from public-api Needs: https://review.tizen.org/gerrit/#/c/42196/ https://review.tizen.org/gerrit/#/c/42203/ Change-Id: I6420861d1673c81c489d69700123b88ce86cdeed Signed-off-by: Richard Underhill --- dali-toolkit/internal/controls/popup/popup-impl.cpp | 6 +++--- .../internal/controls/text-controls/text-selection-popup-impl.cpp | 4 ++-- dali-toolkit/internal/text/decorator/text-decorator.cpp | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp index df6a1b2..fa9bc5a 100755 --- a/dali-toolkit/internal/controls/popup/popup-impl.cpp +++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp @@ -226,7 +226,7 @@ void Popup::SetBackgroundImage( Actor image ) if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) { - imageActor.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); + imageActor.SetSortModifier( BACKGROUND_DEPTH_INDEX ); } Vector3 border( mPopupStyle->backgroundOuterBorder.x, mPopupStyle->backgroundOuterBorder.z, 0.0f ); @@ -251,7 +251,7 @@ void Popup::SetButtonAreaImage( Actor image ) if ( ImageActor imageActor = DownCast< ImageActor >( image ) ) { - imageActor.SetDepthIndex( BACKGROUND_DEPTH_INDEX + 1 ); + imageActor.SetSortModifier( BACKGROUND_DEPTH_INDEX + 1 ); } // OnDialogTouched only consume the event. It prevents the touch event to be caught by the backing. @@ -427,7 +427,7 @@ void Popup::CreateBacking() { mBacking = Dali::Toolkit::CreateSolidColorActor( mPopupStyle->backingColor ); mBacking.SetName( "POPUP_BACKING" ); - mBacking.SetDepthIndex( BACKGROUND_DEPTH_INDEX - 1 ); + mBacking.SetSortModifier( BACKGROUND_DEPTH_INDEX - 1 ); mBacking.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); mBacking.SetSensitive(true); diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp index fac6ada..e2ee154 100644 --- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp +++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp @@ -463,8 +463,8 @@ Dali::Image TextSelectionPopup::GetPopupImage( PopupParts part ) // 3. Create the icons ImageActor pressedIcon = ImageActor::New( iconImage ); ImageActor icon = ImageActor::New( iconImage ); - icon.SetDepthIndex( DECORATION_DEPTH_INDEX - 1 ); - pressedIcon.SetDepthIndex( DECORATION_DEPTH_INDEX - 1 ); + icon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 ); + pressedIcon.SetSortModifier( DECORATION_DEPTH_INDEX - 1 ); icon.SetName("image-icon-2014"); icon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); pressedIcon.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); diff --git a/dali-toolkit/internal/text/decorator/text-decorator.cpp b/dali-toolkit/internal/text/decorator/text-decorator.cpp index 5f19660..8e7529a 100644 --- a/dali-toolkit/internal/text/decorator/text-decorator.cpp +++ b/dali-toolkit/internal/text/decorator/text-decorator.cpp @@ -391,7 +391,7 @@ struct Decorator::Impl : public ConnectionTracker void CreateCursor( ImageActor& cursor, const Vector4& color ) { cursor = CreateSolidColorActor( color ); - cursor.SetDepthIndex( DECORATION_DEPTH_INDEX ); + cursor.SetSortModifier( DECORATION_DEPTH_INDEX ); cursor.SetParentOrigin( ParentOrigin::TOP_LEFT ); // Need to set the default parent origin as CreateSolidColorActor() sets a different one. cursor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); } @@ -509,7 +509,7 @@ struct Decorator::Impl : public ConnectionTracker } grabHandle.actor = ImageActor::New( mHandleImages[GRAB_HANDLE][HANDLE_IMAGE_RELEASED] ); - grabHandle.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); + grabHandle.actor.SetSortModifier( DECORATION_DEPTH_INDEX ); grabHandle.actor.SetAnchorPoint( AnchorPoint::TOP_CENTER ); // Area that Grab handle responds to, larger than actual handle so easier to move #ifdef DECORATOR_DEBUG @@ -557,7 +557,7 @@ struct Decorator::Impl : public ConnectionTracker primary.actor.SetName("SelectionHandleOne"); #endif primary.actor.SetAnchorPoint( AnchorPoint::TOP_RIGHT ); // Change to BOTTOM_RIGHT if Look'n'Feel requires handle above text. - primary.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); + primary.actor.SetSortModifier( DECORATION_DEPTH_INDEX ); primary.flipped = false; primary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move @@ -589,7 +589,7 @@ struct Decorator::Impl : public ConnectionTracker secondary.actor.SetName("SelectionHandleTwo"); #endif secondary.actor.SetAnchorPoint( AnchorPoint::TOP_LEFT ); // Change to BOTTOM_LEFT if Look'n'Feel requires handle above text. - secondary.actor.SetDepthIndex( DECORATION_DEPTH_INDEX ); + secondary.actor.SetSortModifier( DECORATION_DEPTH_INDEX ); secondary.flipped = false; secondary.grabArea = Actor::New(); // Area that Grab handle responds to, larger than actual handle so easier to move -- 2.7.4