[dali_1.0.37] Merge branch 'tizen'

[platform/core/uifw/dali-demo.git] / resources / scripts / background-color.json

diff --git a/resources/scripts/background-color.json b/resources/scripts/background-color.json
index d8d97b8..4d6051b 100644 (file)
--- a/resources/scripts/background-color.json
+++ b/resources/scripts/background-color.json
@@ -16,9 +16,9 @@
  */
 {
   "stage": [
-    // A TextView with a red background
+    // A TextLabel with a red background
     {
-      "type": "TextView",
+      "type": "TextLabel",
       "text": "Hello World",
       "parent-origin": "TOP_CENTER",
       "anchor-point": "TOP_CENTER",
@@ -29,6 +29,7 @@
     // A container with a yellow background
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "CENTER",
       "anchor-point": "BOTTOM_CENTER",
       "background-color": [1, 1, 0, 1],
@@ -38,10 +39,11 @@
     // A container with an image
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "CENTER",
       "anchor-point": "TOP_CENTER",
       "size": [400, 150, 1],
-      "background": {
+      "background-image": {
         "image": {
           "filename": "{DALI_IMAGE_DIR}button-background.png"
         }
@@ -51,11 +53,12 @@
     // A container with the same image blended in with a blue background
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "BOTTOM_CENTER",
       "anchor-point": "BOTTOM_CENTER",
       "size": [400, 150, 1],
       "background-color": [0, 0, 1, 1],
-      "background": {
+      "background-image": {
         "image": {
           "filename": "{DALI_IMAGE_DIR}button-background.png"
         }