Merge "Add APIs for console message & loading error in web view." into devel/master

diff --git a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
index 4b7ea13..e2d9f91 100644 (file)
--- a/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
+++ b/dali-toolkit/internal/controls/text-controls/text-selection-popup-impl.cpp
@@ -284,7 +284,7 @@ Property::Value TextSelectionPopup::GetProperty(BaseObject* object, Property::In
       case Toolkit::TextSelectionPopup::Property::OPTION_DIVIDER_PADDING:
       {
         Padding padding = impl.GetOptionDividerPadding();
-        value           = Vector4(padding.x, padding.y, padding.top, padding.bottom);
+        value           = Vector4(padding.left, padding.right, padding.top, padding.bottom);
         break;
       }
       case Toolkit::TextSelectionPopup::Property::POPUP_CLIPBOARD_BUTTON_ICON_IMAGE:
@@ -643,8 +643,8 @@ std::string TextSelectionPopup::GetPressedImage() const
 
 void TextSelectionPopup::SetOptionDividerPadding(const Padding& padding)
 {
-  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextSelectionPopup::SetOptionDividerPadding padding(%f,%f,%f,%f)\n", padding.left, padding.right, padding.bottom, padding.top);
-  mOptionDividerPadding = Padding(padding.left, padding.right, padding.bottom, padding.top);
+  DALI_LOG_INFO(gLogFilter, Debug::Verbose, "TextSelectionPopup::SetOptionDividerPadding padding(%f,%f,%f,%f)\n", padding.left, padding.right, padding.top, padding.bottom);
+  mOptionDividerPadding = Padding(padding.left, padding.right, padding.top, padding.bottom);
 }
 
 Padding TextSelectionPopup::GetOptionDividerPadding() const

diff --git a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
index 3627ef4..3b5d1ce 100644 (file)
--- a/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/720x1280/dali-toolkit-default-theme.json
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * This file is part of Dali Toolkit
  *
@@ -98,29 +98,36 @@
     },
     "TextSelectionPopup":
     {
-      "popupMaxSize":[656,72],
-      "optionDividerSize":[2,0],
-      "popupDividerColor":[0.23,0.72,0.8,0.11],
+      "popupMaxSize":[656,36],
+      "optionDividerSize":[1,0],
+      "optionDividerPadding":[0.0,0.0,6.0,6.0],
+      "popupDividerColor":[1.0,1.0,1.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}selection-popup-background.9.png"
+        "url": "{DALI_IMAGE_DIR}IoT-selection-popup-background.9.png",
+        "mixColor":[0.0,0.05,0.17,0.9]
         },
       "backgroundBorder": {
         "visualType": "IMAGE",
         "url": "{DALI_IMAGE_DIR}selection-popup-border.9.png",
-        "mixColor":[0.24,0.72,0.8,1.0]
+        "mixColor":[0.0,0.0,0.0,0.0]
         },
       "popupFadeInDuration":0.25,
       "popupFadeOutDuration":0.25
     },
     "TextSelectionPopupButton":
     {
+      "minimumSize":[0,36],
+      "labelPadding":[0.0,0.0,0.0,0.0],
       "label":
       {
         "visualType":"TEXT",
-        "pointSize":8
+        "pointSize":18,
+        "textColor":[1.0,1.0,1.0,1.0],
+        "fontFamily":"BreezeSans",
+        "fontStyle" : {"weight":"light"}
       },
       "unselectedBackgroundVisual":
       {
@@ -136,7 +143,7 @@
     "TextSelectionToolbar":
     {
       "enableOvershoot":true,
-      "enableScrollBar":true,
+      "enableScrollBar":false,
       "scrollView":
       {
         "overshootAnimationSpeed":360.0,

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
new file mode 100644 (file)
index 0000000..7903ae2
Binary files /dev/null and b/dali-toolkit/styles/images-common/IoT-selection-popup-background.9.png differ