Merge "Fix TableView::GetNextKeyboardFocusableActor function by returning a valid...

[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 5bf3c13..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":
       {
-        "visualType": "TEXT",
+        "visualType":"TEXT",
         "pointSize":8
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
       }
     },
     "TextSelectionToolbar":
@@ -218,14 +220,7 @@
     "Button":
     {
       "initialAutoRepeatingDelay":2.0,
-      "nextAutoRepeatingDelay":0.9,
-       "label":
-       {
-         "visualType": "TEXT",
-         "horizontalAlignment": "CENTER",
-         "pointSize" : 15.0, // Point size must always be provided to Text Visual
-         "verticalAlignment": "CENTER"
-       }
+      "nextAutoRepeatingDelay":0.9
       // Note: Visuals added to Button will be used in all derived buttons unless overridden.
     },
     "PushButton":
@@ -234,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",
@@ -258,6 +260,13 @@
     "CheckBoxButton":
     {
       "styles":["Button"],
+      "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",
@@ -282,6 +291,13 @@
     "RadioButton":
     {
       "styles":["Button"],
+      "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",