Update the stylesheet with the Control property change

Change-Id: I25929a8e4c531d22081093d795eee38464a0b5d0

diff --git a/dali-toolkit/public-api/controls/control.h b/dali-toolkit/public-api/controls/control.h
index 74f7fa8..1d8dd28 100644 (file)
--- a/dali-toolkit/public-api/controls/control.h
+++ b/dali-toolkit/public-api/controls/control.h
@@ -279,8 +279,6 @@ public:
   /**
    * @brief Sets an image as the background of the control.
    *
   /**
    * @brief Sets an image as the background of the control.
    *

-   * The color of this image is blended with the background color @see SetBackgroundColor
-   *

    * @param[in] image The image to set as the background.
    */
   void SetBackgroundImage( Image image );
    * @param[in] image The image to set as the background.
    */
   void SetBackgroundImage( Image image );

diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index ad05fea..c45b44e 100644 (file)
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -99,7 +99,7 @@ distributing this software or its derivatives.
       "popup-divider-color":[0.23,0.72,0.8,0.11],
       "popup-icon-color":[1.0,1.0,1.0,1.0],
       "popup-pressed-color":[0.24,0.72,0.8,0.11],
       "popup-divider-color":[0.23,0.72,0.8,0.11],
       "popup-icon-color":[1.0,1.0,1.0,1.0],
       "popup-pressed-color":[0.24,0.72,0.8,0.11],

-      "background-image": {
+      "background": {

         "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popup-fade-in-duration":0.25,
         "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popup-fade-in-duration":0.25,

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 8a0fc66..694e2db 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -99,7 +99,7 @@ distributing this software or its derivatives.
       "popup-divider-color":[0.23,0.72,0.8,0.11],
       "popup-icon-color":[1.0,1.0,1.0,1.0],
       "popup-pressed-color":[0.24,0.72,0.8,0.11],
       "popup-divider-color":[0.23,0.72,0.8,0.11],
       "popup-icon-color":[1.0,1.0,1.0,1.0],
       "popup-pressed-color":[0.24,0.72,0.8,0.11],

-      "background-image": {
+      "background": {

         "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popup-fade-in-duration":0.25,
         "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popup-fade-in-duration":0.25,