Merge "DALi Version 2.1.23" into devel/master

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / devel-api / controls / text-controls / text-selection-popup.h

diff --git a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
index c46d138..4080c90 100644 (file)
--- a/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
+++ b/dali-toolkit/devel-api/controls/text-controls/text-selection-popup.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_SELECTION_POPUP_H
 
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -103,6 +103,12 @@ public:
       OPTION_DIVIDER_SIZE,
 
       /**
+       * @brief The padding of the divider between options.
+       * @details Name "optionDividerPadding", type Vector4.
+       */
+      OPTION_DIVIDER_PADDING,
+
+      /**
        * @brief The image to use as the popup clipboard icon.
        * @details Name "popupClipboardButtonImage", type string.
        */
@@ -235,11 +241,11 @@ public:
   void EnableButtons(Toolkit::TextSelectionPopup::Buttons buttonsToEnable);
 
   /**
-   * @brief Raises the toolbar's layer above the given @e target layer.
+   * @brief Raises the toolbar's actor above the given @e target actor.
    *
-   * @param[in] target The layer to get above of.
+   * @param[in] target The actor to get above of.
    */
-  void RaiseAbove(Layer target);
+  void RaiseAbove(Actor target);
 
   /**
    * @brief Show the Popup if not being shown