[dali_2.3.21] Merge branch 'devel/master'

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / text / decorator / text-decorator.h

diff --git a/dali-toolkit/internal/text/decorator/text-decorator.h b/dali-toolkit/internal/text/decorator/text-decorator.h
index ad3037e..ab0153a 100644 (file)
--- a/dali-toolkit/internal/text/decorator/text-decorator.h
+++ b/dali-toolkit/internal/text/decorator/text-decorator.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_DECORATOR_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
@@ -21,6 +21,7 @@
 // EXTERNAL INCLUDES
 #include <dali/public-api/common/intrusive-ptr.h>
 #include <dali/public-api/math/rect.h>
+#include <dali/public-api/object/property-map.h>
 #include <dali/public-api/object/ref-object.h>
 
 // INTERNAL INCLUDES
@@ -192,8 +193,10 @@ public:
    * @brief The decorator waits until a relayout before creating actors etc.
    *
    * @param[in] size The size of the parent control after size-negotiation.
+   * @param[in,out]  container  The control should add actors to this container that it is not able
+   *                            to allocate a size for.
    */
-  void Relayout(const Dali::Vector2& size);
+  void Relayout(const Dali::Vector2& size, RelayoutContainer& container);
 
   /**
    * @brief Updates the decorator's actor positions after scrolling.
@@ -558,6 +561,20 @@ public:
   TextSelectionPopup::Buttons& GetEnabledPopupButtons();
 
   /**
+   * @brief Used to set the selection popup options
+   *
+   * @param[in] options The property map of selection popup options
+   */
+  void SetSelectionPopupStyle(const Property::Map& options);
+
+  /**
+   * @brief Used to get the selection popup options
+   *
+   * @param[out] options The property map of selection popup options
+   */
+  void GetSelectionPopupStyle(Property::Map& options);
+
+  /**
    * @brief Sets the scroll threshold.
    *
    * It defines a square area inside the control, close to the edge.