Changes after 40127, changing control background to 0.f

Change-Id: I05897aa4d0df28cab2e19557c80550420972a9b5

diff --git a/examples/animated-shapes/animated-shapes-example.cpp b/examples/animated-shapes/animated-shapes-example.cpp
index b9c37559bb6797feafedd5d2f82b2bd0d19e95b3..11de583783afc8bf093eb42cb1c915d780e7bbf2 100644 (file)
--- a/examples/animated-shapes/animated-shapes-example.cpp
+++ b/examples/animated-shapes/animated-shapes-example.cpp
@@ -55,11 +55,12 @@ public:
     // Get a handle to the stage
     Stage stage = Stage::GetCurrent();
 
-    //Create a view
+    // Create a view
     mView = Dali::Toolkit::Control::New();
     mView.SetAnchorPoint( Dali::AnchorPoint::CENTER );
     mView.SetParentOrigin( Dali::ParentOrigin::CENTER );
     mView.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
+    mView.SetDrawMode( DrawMode::OVERLAY );
     stage.Add( mView );
 
     //Set background image for the view

diff --git a/examples/path-animation/path-animation.cpp b/examples/path-animation/path-animation.cpp
index f1b1dd32fa0fc3074a661dae25a8a8eb28c68826..8eaf0fcdae3b6429e60e74391100882bd1db502d 100644 (file)
--- a/examples/path-animation/path-animation.cpp
+++ b/examples/path-animation/path-animation.cpp
@@ -140,8 +140,6 @@ public:
    */
   void DrawPath( unsigned int resolution )
   {
-    Stage stage = Dali::Stage::GetCurrent();
-
     //Create path mesh actor
     Dali::MeshData meshData = MeshFactory::NewPath( mPath, resolution );
     Dali::Material material = Material::New("LineMaterial");
@@ -150,12 +148,12 @@ public:
     Dali::Mesh mesh = Dali::Mesh::New( meshData );
     if( mMeshPath )
     {
-      stage.Remove( mMeshPath );
+      mContentLayer.Remove( mMeshPath );
     }
     mMeshPath = Dali::MeshActor::New( mesh );
     mMeshPath.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mMeshPath.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    stage.Add( mMeshPath );
+    mContentLayer.Add( mMeshPath );
 
 
     ////Create mesh connecting interpolation points and control points
@@ -192,12 +190,12 @@ public:
     mesh = Dali::Mesh::New( meshData );
     if( mMeshHandlers )
     {
-      stage.Remove( mMeshHandlers );
+      mContentLayer.Remove( mMeshHandlers );
     }
     mMeshHandlers = Dali::MeshActor::New( mesh );
     mMeshHandlers.SetAnchorPoint( AnchorPoint::TOP_LEFT );
     mMeshHandlers.SetParentOrigin( ParentOrigin::TOP_LEFT );
-    stage.Add( mMeshHandlers );
+    mContentLayer.Add( mMeshHandlers );
 
 
     //Create actors representing interpolation points
@@ -456,6 +454,7 @@ public:
                                             BACKGROUND_IMAGE,
                                             TOOLBAR_IMAGE,
                                             "" );
+    mContentLayer.SetDrawMode( DrawMode::OVERLAY );
 
     mContentLayer.TouchedSignal().Connect(this, &PathController::OnTouchLayer);
 
@@ -475,7 +474,7 @@ public:
     mActor = ImageActor::New( img );
     mActor.SetAnchorPoint( AnchorPoint::CENTER );
     mActor.SetSize( 100, 50, 1 );
-    stage.Add( mActor );
+    mContentLayer.Add( mActor );
 
     CreateAnimation();
     CreateControls();

diff --git a/resources/scripts/animated-colors.json b/resources/scripts/animated-colors.json
index a7e268c5c689c3bdbaa6221272a8efb5cd02d416..e60b7abd4cb051bd80308f7e313eb27f8c9bae22 100644 (file)
--- a/resources/scripts/animated-colors.json
+++ b/resources/scripts/animated-colors.json
@@ -18,12 +18,10 @@
   "stage": [
     {
       "type": "Control",
-      "relayout-enabled": false,
+      "draw-mode": "OVERLAY",
       "actors": [
         {
           "type": "Control",
-         "relayout-enabled": true,
-          "actors": [],
           "name": "Control 8",
           "position": [
             0,
@@ -62,12 +60,9 @@
         },
         {
           "type": "Control",
-         "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
-             "relayout-enabled": false,
-              "actors": [],
               "name": "Container 2",
               "position": [
                 0,
@@ -106,12 +101,9 @@
             },
             {
               "type": "Control",
-             "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
-                  "actors": [],
                   "name": "Container 4",
                   "position": [
                     0,
@@ -187,12 +179,9 @@
             },
             {
               "type": "Control",
-             "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
-                  "actors": [],
                   "name": "Container 5",
                   "position": [
                     0,
@@ -231,12 +220,9 @@
                 },
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
-                     "relayout-enabled": false,
-                      "actors": [],
                       "name": "Container 7",
                       "position": [
                         0,
@@ -312,12 +298,9 @@
                 },
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
-                     "relayout-enabled": false,
-                      "actors": [],
                       "name": "Container 8",
                       "position": [
                         0,
@@ -356,12 +339,9 @@
                     },
                     {
                       "type": "Control",
-                     "relayout-enabled": false,
                       "actors": [
                         {
                           "type": "Control",
-                         "relayout-enabled": false,
-                          "actors": [],
                           "name": "Container 10",
                           "position": [
                             0,
@@ -548,12 +528,9 @@
         },
         {
           "type": "Control",
-         "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
-             "relayout-enabled": false,
-              "actors": [],
               "name": "Control 4",
               "position": [
                 0,
@@ -629,15 +606,12 @@
         },
         {
           "type": "Control",
-         "relayout-enabled": false,
           "actors": [
             {
               "type": "Control",
-             "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
-                  "actors": [],
                   "name": "Container 13",
                   "position": [
                     0,
@@ -713,8 +687,6 @@
             },
             {
               "type": "Control",
-             "relayout-enabled": false,
-              "actors": [],
               "name": "Container 11",
               "position": [
                 0,
@@ -753,16 +725,12 @@
             },
             {
               "type": "Control",
-             "relayout-enabled": false,
               "actors": [
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
                   "actors": [
                     {
                       "type": "Control",
-                     "relayout-enabled": false,
-                      "actors": [],
                       "name": "Container 15",
                       "position": [
                         0,
@@ -838,8 +806,6 @@
                 },
                 {
                   "type": "Control",
-                 "relayout-enabled": false,
-                  "actors": [],
                   "name": "Container 16",
                   "position": [
                     0,
@@ -949,7 +915,27 @@
             0.3411764705882353,
             1
           ]
+        },
+            {
+      "type": "TextLabel",
+      "name": "text",
+      "parent-origin": "CENTER",
+      "anchor-point": "CENTER",
+      "text": "START",
+      "point-size": 20,
+      "signals": [
+        {
+          "name": "tapped",
+          "action": "play",
+          "animation": "Animation_1"
+        },
+        {
+          "name": "tapped",
+          "action": "play",
+          "animation": "HideText"
         }
+      ]
+    }
       ],
       "name": "Container 1",
       "position": [
@@ -986,26 +972,6 @@
         0.32941176470588235,
         1
       ]
-    },
-    {
-      "type": "TextLabel",
-      "name": "text",
-      "parent-origin": "CENTER",
-      "anchor-point": "CENTER",
-      "text": "START",
-      "point-size": 20,
-      "signals": [
-        {
-          "name": "tapped",
-          "action": "play",
-          "animation": "Animation_1"
-        },
-        {
-          "name": "tapped",
-          "action": "play",
-          "animation": "HideText"
-        }
-      ]
     }
   ],
   "animations": {

diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json
index 4d6051bf9cb45bc2902caa42da0670ab11df3da1..562b88e91c560111ece7c2fe01d3ad696a39884f 100644 (file)
--- a/resources/scripts/background-color.json
+++ b/resources/scripts/background-color.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2015 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,13 @@
     // A TextLabel with a red background
     {
       "type": "TextLabel",
+      "draw-mode": "OVERLAY",
       "text": "Hello World",
       "parent-origin": "TOP_CENTER",
       "anchor-point": "TOP_CENTER",
       "background-color": [1, 0, 0, 1],
+      "position": [0, 50, 0],
+      "point-size": 40,
       "size": [400, 150, 1]
     },
 

diff --git a/resources/scripts/table-view.json b/resources/scripts/table-view.json
index 0a9fdca2748a93408043a3008fc534cc2b94ccc2..14b90c3be2c8f5a4e311d328ba207f5c10cf9614 100644 (file)
--- a/resources/scripts/table-view.json
+++ b/resources/scripts/table-view.json
@@ -21,6 +21,7 @@
       "type":"TableView",
       "background-color": [0.5,0.5,0,1],
       "parent-origin": "CENTER",
+      "draw-mode": "OVERLAY",
       "size":[400,500,1],
       "cell-padding": [10, 5],
       "layout-rows": {  // set the height of the rows