Merge "Modified control depth index ranges so they have less impact on sorting algori...

diff --git a/dali-toolkit/public-api/controls/control-depth-index-ranges.h b/dali-toolkit/public-api/controls/control-depth-index-ranges.h
index e9fc76a..1a55cf2 100644 (file)
--- a/dali-toolkit/public-api/controls/control-depth-index-ranges.h
+++ b/dali-toolkit/public-api/controls/control-depth-index-ranges.h
@@ -18,15 +18,16 @@
  *
  */
 
+#include <dali/public-api/actors/layer.h>
 namespace Dali
 {
 namespace Toolkit
 {
 enum ControlDepthIndexRanges
 {
-    BACKGROUND_DEPTH_INDEX    = -10000000,
-    CONTENT_DEPTH_INDEX       =  0,
-    DECORATION_DEPTH_INDEX    =  10000000
+    BACKGROUND_DEPTH_INDEX    = static_cast<int>( -Dali::Layer::TREE_DEPTH_MULTIPLIER * 0.1f ),
+    CONTENT_DEPTH_INDEX       = 0,
+    DECORATION_DEPTH_INDEX    = static_cast<int>( Dali::Layer::TREE_DEPTH_MULTIPLIER * 0.1f )
 };
 
 }