Merge "Updated control transitions to work with visual transform" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / styles / 720x1280 / dali-toolkit-default-theme.json

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index a57d641..2f24933 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -57,14 +57,6 @@
     {
       "pointSize":25
     },
-    "RadioButton":
-    {
-      "unselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected.png",
-      "selectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected.png",
-      "disabledUnselectedStateImage":"{DALI_IMAGE_DIR}radio-button-unselected-disabled.png",
-      "disabledSelectedStateImage":"{DALI_IMAGE_DIR}radio-button-selected-disabled.png"
-    },
-
     "TextField":
     {
       "pointSize":18,
@@ -115,8 +107,18 @@
     {
       "label":
       {
-        "pointSize":8,
-        "fontStyle":{"weight":"light"}
+        "visualType":"TEXT",
+        "pointSize":8
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
       }
     },
     "TextSelectionToolbar":
@@ -218,8 +220,7 @@
     "Button":
     {
       "initialAutoRepeatingDelay":2.0,
-      "nextAutoRepeatingDelay":0.9,
-      "labelStrutLength":12
+      "nextAutoRepeatingDelay":0.9
       // Note: Visuals added to Button will be used in all derived buttons unless overridden.
     },
     "PushButton":
@@ -228,6 +229,13 @@
       "autoRepeating":false,
       "togglable":false,
       "labelPadding":[ 12.0, 12.0, 12.0, 12.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "horizontalAlignment": "CENTER",
+         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
       "unselectedBackgroundVisual":
        {
          "visualType": "IMAGE",
@@ -252,22 +260,29 @@
     "CheckBoxButton":
     {
       "styles":["Button"],
-      "unselectedBackgroundVisual":
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}checkbox-unselected.png"
       },
-      "selectedBackgroundVisual":
+      "selectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}checkbox-selected.png"
       },
-      "disabledUnselectedBackgroundVisual":
+      "disabledUnselectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}checkbox-unselected-disabled.png"
       },
-      "disabledSelectedBackgroundVisual":
+      "disabledSelectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}checkbox-selected-disabled.png"
@@ -276,22 +291,29 @@
     "RadioButton":
     {
       "styles":["Button"],
-      "unselectedBackgroundVisual":
+      "labelPadding":[ 12.0, 12.0, 0.0, 0.0 ],
+      "label":
+       {
+         "visualType": "TEXT",
+         "pointSize" : 12.0, // Point size must always be provided to Text Visual
+         "verticalAlignment": "CENTER"
+       },
+      "unselectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}radio-button-unselected.png"
       },
-      "selectedBackgroundVisual":
+      "selectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}radio-button-selected.png"
       },
-      "disabledUnselectedBackgroundVisual":
+      "disabledUnselectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}radio-button-unselected-disabled.png"
       },
-      "disabledSelectedBackgroundVisual":
+      "disabledSelectedVisual":
       {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}radio-button-selected-disabled.png"