Merge "Tizen Directory Migration" 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 26b3c80..029dcbd 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -30,7 +30,11 @@
   {
     "textlabel":
     {
-      "pointSize":18
+      "pointSize":18,
+      "enableAutoScroll":false,
+      "autoScrollLoopCount":2,
+      "autoScrollGap":50,
+      "autoScrollSpeed":80
     },
 
     "textlabelFontSize0":
@@ -94,8 +98,8 @@
       "popupIconColor":[1.0,1.0,1.0,1.0],
       "popupPressedColor":[0.24,0.72,0.8,0.11],
       "background": {
-        "rendererType": "nPatch",
-        "imageUrl": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        "rendererType": "IMAGE",
+        "url": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
         },
       "popupFadeInDuration":0.25,
       "popupFadeOutDuration":0.25