Removed DepthIndex methods from public-api

Needs: https://review.tizen.org/gerrit/#/c/42201/
       https://review.tizen.org/gerrit/#/c/42203/

Change-Id: If6a14183e3d4f87125484b1dd4ff88b8aae38832
Signed-off-by: Richard Underhill <r.underhill@partner.samsung.com>

diff --git a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
index 840ae91..97f1b28 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-HoverProcessing.cpp
@@ -1014,7 +1014,7 @@ int UtcDaliHoverMultipleRenderableActors(void)
   ImageActor actor = ImageActor::New();
   actor.SetSize( 100.0f, 100.0f );
   actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  actor.SetDepthIndex( 1 );
+  actor.SetSortModifier( 1.0f );
   parent.Add(actor);
 
   // Render and notify

diff --git a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
index e076475..8d09883 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
+++ b/automated-tests/src/dali/utc-Dali-TouchProcessing.cpp
@@ -1008,7 +1008,7 @@ int UtcDaliTouchMultipleRenderableActors(void)
   ImageActor actor = ImageActor::New();
   actor.SetSize(100.0f, 100.0f);
   actor.SetAnchorPoint(AnchorPoint::TOP_LEFT);
-  actor.SetDepthIndex( 1 );
+  actor.SetSortModifier( 1.0f );
   parent.Add(actor);
 
   // Render and notify

diff --git a/dali/internal/event/actors/image-actor-impl.cpp b/dali/internal/event/actors/image-actor-impl.cpp
index a2188c4..f81952b 100644 (file)
--- a/dali/internal/event/actors/image-actor-impl.cpp
+++ b/dali/internal/event/actors/image-actor-impl.cpp
@@ -477,7 +477,7 @@ void ImageActor::SetDepthIndex( int depthIndex )
 
 int ImageActor::GetDepthIndex() const
 {
-  return static_cast< int >( GetSortModifier() );
+  return static_cast< int >( mImageAttachment->GetSortModifier() );
 }
 
 void ImageActor::SetCullFace(CullFaceMode mode)

diff --git a/dali/public-api/actors/image-actor.cpp b/dali/public-api/actors/image-actor.cpp
index 2773159..da3cf18 100644 (file)
--- a/dali/public-api/actors/image-actor.cpp
+++ b/dali/public-api/actors/image-actor.cpp
@@ -130,16 +130,6 @@ float ImageActor::GetSortModifier() const
   return GetImplementation(*this).GetSortModifier();
 }
 
-void ImageActor::SetDepthIndex( int depthIndex )
-{
-  GetImplementation(*this).SetDepthIndex( depthIndex );
-}
-
-int ImageActor::GetDepthIndex() const
-{
-  return GetImplementation(*this).GetDepthIndex();
-}
-
 void ImageActor::SetCullFace(const CullFaceMode mode)
 {
   GetImplementation(*this).SetCullFace(mode);

diff --git a/dali/public-api/actors/image-actor.h b/dali/public-api/actors/image-actor.h
index 0f91e38..158f9fb 100644 (file)
--- a/dali/public-api/actors/image-actor.h
+++ b/dali/public-api/actors/image-actor.h
@@ -318,24 +318,6 @@ public:
   float GetSortModifier() const;
 
   /**
-   * @brief Sets the depth index within a layer for the depth sort algorithm.
-   *
-   * This is intended to replace SetSortModifier, which will be deprecated and remains currently for backwards compatibility.
-   *
-   * @param[in] depthIndex The depth index to use for sorting within a layer.
-   */
-  void SetDepthIndex( int depthIndex );
-
-  /**
-   * @brief Retrieves the depth index within a layer.
-   *
-   * This will replace GetSortModifier in the same manner as SetDepthIndex.
-   *
-   * @return The depth index used for sorting within a layer.
-   */
-  int GetDepthIndex() const;
-
-  /**
    * @brief Set the face-culling mode for this actor.
    *
    * @param[in] mode The culling mode.