From: Agnelo Vaz <agnelo.vaz@samsung.com>
Date: Thu, 8 Dec 2016 14:47:04 +0000 (+0000)
Subject: Removing default background from TextField Popup buttons
X-Git-Tag: dali_1.2.19~9
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=6552601a0d95183a8cf0e01f64e8cba44bf6da8f

Removing default background from TextField Popup buttons

Updating style files

Change-Id: Icb23db3a2ec2c82421e38831e03d3a92047a8702
---

diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp
index aef2ddf..51dd6ef 100644
--- a/dali-toolkit/internal/controls/buttons/button-impl.cpp
+++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp
@@ -974,7 +974,7 @@ void Button::OnRelayout( const Vector2& size, RelayoutContainer& container )
 
   if ( currentBackGroundVisual )
   {
-    DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual bakcground size to(%f,%f)\n", size.width, size.height);
+    DALI_LOG_INFO( gLogButtonFilter, Debug::General, "OnRelayout Setting visual background size to(%f,%f)\n", size.width, size.height);
 
     Property::Map visualTransform;
 
diff --git a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
index 4f33d78..ea73d40 100644
--- a/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/1920x1080/dali-toolkit-default-theme.json
@@ -108,8 +108,18 @@
     {
       "label":
       {
-        "pointSize":120,
-        "fontStyle":{"weight":"light"}
+        "visualType":"TEXT",
+        "pointSize":120
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
       }
     },
     "TextSelectionToolbar":
@@ -210,22 +220,22 @@
          "pointSize" : 15.0, // Point size must always be provided to Text Visual
          "verticalAlignment": "CENTER"
        },
-      "unselectedBackgroundVisual":
+      "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"
@@ -241,22 +251,22 @@
          "pointSize" : 15.0, // Point size must always be provided to Text Visual
          "verticalAlignment": "CENTER"
        },
-      "unselectedBackgroundVisual":
+      "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"
diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index 970fb13..431f73c 100644
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -109,6 +109,16 @@
       {
         "visualType":"TEXT",
         "pointSize":8
+      },
+      "unselectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
+      },
+      "selectedBackgroundVisual":
+      {
+        "visualType": "IMAGE",
+        "url": ""
       }
     },
     "TextSelectionToolbar":
diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index aec2ff3..01d78fd 100644
--- 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":