[dali_1.1.33] Merge branch 'devel/master'

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

diff --git a/resources/scripts/background.json b/resources/scripts/background.json
index 04777c9..cd1944a 100644 (file)
--- a/resources/scripts/background.json
+++ b/resources/scripts/background.json
@@ -26,15 +26,30 @@
       "pointSize": 20,
       "horizontalAlignment": "CENTER",
       "verticalAlignment": "CENTER",
-      "widthResizePolicy":"FILL_TO_PARENT",
+      "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
-      "sizeModeFactor": [ 1.0, 0.33, 1 ],
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background":{
         "rendererType": "color",
-        "blendColor": [ 0.8, 0, 0.2, 1 ]
+        "mixColor": [ 0.8, 0, 0.2, 1 ]
        }
     },
 
+    // A control with an SVG image
+    {
+      "type": "Control",
+      "relayoutEnabled": false,
+      "parentOrigin": "TOP_RIGHT",
+      "anchorPoint": "TOP_RIGHT",
+      "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
+      "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
+      "background": {
+        "rendererType": "image",
+        "url": "{DEMO_IMAGE_DIR}Kid1.svg"
+      }
+    },
+
     // A control with a border
     {
       "type": "Control",
@@ -43,7 +58,7 @@
       "anchorPoint": "CENTER_LEFT",
       "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
-      "sizeModeFactor": [ 0.5, 0.33, 1],
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background": {
         "rendererType" : "border",
         "borderColor" : [ 0.5, 0.5, 0.5, 1 ],
@@ -51,7 +66,7 @@
       }
     },
 
-    // A control with an image
+    // A control with a JPG image
     {
       "type": "Control",
       "relayoutEnabled": false,
@@ -59,10 +74,10 @@
       "anchorPoint": "CENTER_RIGHT",
       "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
-      "sizeModeFactor": [ 0.5, 0.33, 1 ],
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background": {
         "rendererType": "image",
-        "imageUrl": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
+        "url": "{DEMO_IMAGE_DIR}gallery-large-9.jpg"
       }
     },
 
@@ -74,10 +89,10 @@
       "anchorPoint": "BOTTOM_LEFT",
       "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
-      "sizeModeFactor": [ 0.5, 0.33, 1 ],
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background":{
         "rendererType": "color",
-        "blendColor": [ 1, 1, 0, 1 ]
+        "mixColor": [ 1, 1, 0, 1 ]
       }
     },
 
@@ -89,7 +104,7 @@
       "anchorPoint": "BOTTOM_RIGHT",
       "widthResizePolicy":"SIZE_RELATIVE_TO_PARENT",
       "heightResizePolicy":"SIZE_RELATIVE_TO_PARENT",
-      "sizeModeFactor": [ 0.5, 0.33, 1.0 ],
+      "sizeModeFactor": [ 0.5, 0.333333333333, 1 ],
       "background": {
         "rendererType" : "gradient",
         "startPosition" : [ -0.5, -0.5 ],