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

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / public-api / controls / text-controls / text-label.h

diff --git a/dali-toolkit/public-api/controls/text-controls/text-label.h b/dali-toolkit/public-api/controls/text-controls/text-label.h
index 471a619..2d91933 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-label.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-label.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_LABEL_H
 
 /*
- * Copyright (c) 2021 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 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.
@@ -382,6 +382,25 @@ public:
   static TextLabel New(const std::string& text);
 
   /**
+   * @brief Creates the TextLabel control with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to the TextLabel control
+   */
+  static TextLabel New(ControlBehaviour additionalBehaviour);
+
+  /**
+   * @brief Creates the TextLabel control with additional behaviour.
+   *
+   * @SINCE_2_1.8
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @param[in] text The text to display
+   * @return A handle to the TextLabel control
+   */
+  static TextLabel New(ControlBehaviour additionalBehaviour, const std::string& text);
+
+  /**
    * @brief Creates an empty handle.
    * @SINCE_1_0.0
    */
@@ -401,7 +420,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TextLabel(TextLabel&& rhs);
+  TextLabel(TextLabel&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -419,7 +438,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  TextLabel& operator=(TextLabel&& rhs);
+  TextLabel& operator=(TextLabel&& rhs) noexcept;
 
   /**
    * @brief Destructor.