Merge "Make internal actors size match TextLabel size" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / popup / popup-impl.cpp

diff --git a/dali-toolkit/internal/controls/popup/popup-impl.cpp b/dali-toolkit/internal/controls/popup/popup-impl.cpp
index df6a1b2..d4fcc43 100755 (executable)
--- a/dali-toolkit/internal/controls/popup/popup-impl.cpp
+++ b/dali-toolkit/internal/controls/popup/popup-impl.cpp
@@ -37,7 +37,7 @@
 #include <dali-toolkit/public-api/controls/control-impl.h>
 #include <dali-toolkit/public-api/controls/control-depth-index-ranges.h>
 #include <dali-toolkit/public-api/controls/default-controls/solid-color-actor.h>
-#include <dali-toolkit/public-api/focus-manager/accessibility-focus-manager.h>
+#include <dali-toolkit/public-api/accessibility-manager/accessibility-manager.h>
 #include <dali-toolkit/internal/focus-manager/keyboard-focus-manager-impl.h>
 #include <dali-toolkit/internal/controls/buttons/button-impl.h>
 
@@ -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);