Remove dali-any from Property::Value

[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..0959179 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.
@@ -16,19 +16,23 @@
  */
 {
   "stage": [
-    // A TextView with a red background
+    // A TextLabel with a red background
     {
-      "type": "TextView",
+      "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]
     },
 
     // 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,27 +42,25 @@
     // A container with an image
     {
       "type": "Control",
+      "relayout-enabled": false,
       "parent-origin": "CENTER",
       "anchor-point": "TOP_CENTER",
       "size": [400, 150, 1],
-      "background": {
-        "image": {
-          "filename": "{DALI_IMAGE_DIR}button-background.png"
-        }
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}button-background.png"
       }
     },
 
     // 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": {
-        "image": {
-          "filename": "{DALI_IMAGE_DIR}button-background.png"
-        }
+      "background-image": {
+        "filename": "{DALI_IMAGE_DIR}button-background.png"
       }
     }
   ]