Merge "Stop setting crazy Z value with controls (at the moment depth is ignored by...

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
index fa3f10c..b5a5942 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-BloomView.cpp
@@ -214,7 +214,7 @@ int UtcDaliBloomOnSizeSet(void)
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 200.0f );
+  Vector3 size( 200.0f, 300.0f, 0.0f );
   view.SetSize( size );
 
   application.SendNotification();

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
index dc1e25a..a6be471 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-EffectsView.cpp
@@ -564,7 +564,7 @@ int UtcDaliEffectsViewSizeSet(void)
 
   {
     EffectsView view = EffectsView::New();
-    view.SetSize( 200.0f, 200.0f, 200.0f );
+    view.SetSize( 200.0f, 200.0f, 0.0f );
     stage.Add( view );
     view.Enable();
     application.SendNotification();
@@ -573,25 +573,25 @@ int UtcDaliEffectsViewSizeSet(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 200.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   {
     EffectsView view = EffectsView::New();
     view.SetOutputImage( FrameBufferImage::New( 200, 200 ) );
     view.SetType( EffectsView::EMBOSS );
-    view.SetSize( 200.0f, 200.0f, 200.0f );
+    view.SetSize( 200.0f, 200.0f, 0.0f );
     stage.Add( view );
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 200.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   {
     EffectsView view = EffectsView::New();
     view.SetType( EffectsView::DROP_SHADOW );
-    view.SetSize( 200.0f, 200.0f, 200.0f );
+    view.SetSize( 200.0f, 200.0f, 0.0f );
     stage.Add( view );
     application.SendNotification();
     application.Render();
@@ -600,7 +600,7 @@ int UtcDaliEffectsViewSizeSet(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 200.0f ), TEST_LOCATION );
+    DALI_TEST_EQUALS( view.GetCurrentSize(), Vector3( 200.0f, 200.0f, 0.0f ), TEST_LOCATION );
   }
 
   END_TEST;

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
index 1d6ba1b..2771fbd 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
@@ -267,7 +267,7 @@ int UtcDaliMagnifierOnSizeSet(void)
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 200.0f );
+  Vector3 size( 200.0f, 300.0f, 0.0f );
   view.SetSize( size );
 
   application.SendNotification();