Merge "[AT-SPI] Set child's parent in WebViewAccessible" into devel/master

diff --git a/dali-toolkit/internal/text/text-selection-handle-controller.cpp b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
index 05d8ad5..e4bf91c 100644 (file)
--- a/dali-toolkit/internal/text/text-selection-handle-controller.cpp
+++ b/dali-toolkit/internal/text/text-selection-handle-controller.cpp
@@ -286,12 +286,7 @@ void SelectionHandleController::Reposition(Controller::Impl& impl)
         selectionBoxInfo->maxX = MIN_FLOAT;
 
         // Update the line's vertical offset.
-        selectionBoxInfo->lineOffset = currentLineOffset + currentLineHeight;
-
-        if(currentLineSpacing < 0)
-        {
-          selectionBoxInfo->lineOffset += currentLineSpacing;
-        }
+        selectionBoxInfo->lineOffset = currentLineOffset + currentLineHeight + currentLineSpacing;
 
         // The line height is the addition of the line ascender and the line descender.
         // However, the line descender has a negative value, hence the subtraction also line spacing should not be included in selection height.

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 3b5d1ce..62b232d 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -98,36 +98,35 @@
     },
     "TextSelectionPopup":
     {
-      "popupMaxSize":[656,36],
-      "optionDividerSize":[1,0],
-      "optionDividerPadding":[0.0,0.0,6.0,6.0],
-      "popupDividerColor":[1.0,1.0,1.0,1.0],
+      "popupMaxSize":[656,40],
+      "optionDividerSize":[0,0],
+      "optionDividerPadding":[0.0,0.0,0.0,0.0],
+      "popupDividerColor":[0.0,0.0,0.0,1.0],
       "popupIconColor":[1.0,1.0,1.0,1.0],
       "popupPressedColor":[0.24,0.72,0.8,0.11],
       "background": {
         "visualType": "IMAGE",
-        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png",
-        "mixColor":[0.0,0.05,0.17,0.9]
+        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png"
         },
       "backgroundBorder": {
         "visualType": "IMAGE",
-        "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
-        "mixColor":[0.0,0.0,0.0,0.0]
+        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-border.9.png",
+        "mixColor":[1.0,1.0,1.0,1.0]
         },
       "popupFadeInDuration":0.25,
       "popupFadeOutDuration":0.25
     },
     "TextSelectionPopupButton":
     {
-      "minimumSize":[0,36],
-      "labelPadding":[0.0,0.0,0.0,0.0],
+      "minimumSize":[0,40],
+      "labelPadding":[-4.0,-4.0,0.0,0.0],
       "label":
       {
         "visualType":"TEXT",
-        "pointSize":18,
-        "textColor":[1.0,1.0,1.0,1.0],
-        "fontFamily":"BreezeSans",
-        "fontStyle" : {"weight":"light"}
+        "pointSize":6.0,
+        "textColor":[0.04,0.06,0.13,1.0],
+        "fontFamily":"SamsungOneUI",
+        "fontStyle" : {"weight":"regular"}
       },
       "unselectedBackgroundVisual":
       {

diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png
index 7903ae2..b27254b 100644 (file)
Binary files a/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png and b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png differ

diff --git a/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png b/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png
new file mode 100644 (file)
index 0000000..553056e
Binary files /dev/null and b/dali-toolkit/styles/images-common/IoT-selection-popup-border.9.png differ