Merge "TextDecorator. Do not destroy the highlight geometry every OnRelayout." into...

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

diff --git a/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json b/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
index a8d4c04..8eeec51 100644 (file)
--- a/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/mobile/dali-toolkit-default-theme.json
@@ -58,6 +58,7 @@ distributing this software or its derivatives.
       "point-size":25
     },
 
+
     "textfield":
     {
       "font-family":"SamsungSans",
@@ -90,11 +91,20 @@ distributing this software or its derivatives.
     {
       "point-size":10
     },
+    "textselectionpopuplabel":
+    {
+      "point-size":8
+    },
     "textselectionpopup":
     {
       "popup-max-size":[400,100],
-      "popup-min-size":[100,65],
-      "background-color":[0.0,0.0,0.0,1.0]
+      "option-divider-size":[2,0],
+      "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": {
+        "filename": "{DALI_IMAGE_DIR}selection-popup-bg.9.png"
+        }
     },
     "scrollview":
     {