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

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

diff --git a/dali-toolkit/public-api/controls/text-controls/text-field.h b/dali-toolkit/public-api/controls/text-controls/text-field.h
index 61bab1c..863fdbf 100644 (file)
--- a/dali-toolkit/public-api/controls/text-controls/text-field.h
+++ b/dali-toolkit/public-api/controls/text-controls/text-field.h
@@ -2,7 +2,7 @@
 #define DALI_TOOLKIT_TEXT_FIELD_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.
@@ -452,7 +452,7 @@ public:
        * @SINCE_1_2.60
        * @note PLACEHOLDER map is used to add ellipsis to placeholder text.
        */
-      ELLIPSIS
+      ELLIPSIS,
     };
   };
 
@@ -482,15 +482,16 @@ public:
    */
     enum Mask
     {
-      NONE        = 0x0000, ///< @SINCE_1_2_2
-      COLOR       = 0x0001, ///< @SINCE_1_2_2
-      FONT_FAMILY = 0x0002, ///< @SINCE_1_2_2
-      POINT_SIZE  = 0x0004, ///< @SINCE_1_2_2
-      FONT_STYLE  = 0x0008, ///< @SINCE_1_2_2
-      UNDERLINE   = 0x0010, ///< @SINCE_1_2_2
-      SHADOW      = 0x0020, ///< @SINCE_1_2_2
-      EMBOSS      = 0x0040, ///< @SINCE_1_2_2
-      OUTLINE     = 0x0080  ///< @SINCE_1_2_2
+      NONE          = 0x0000, ///< @SINCE_1_2_2
+      COLOR         = 0x0001, ///< @SINCE_1_2_2
+      FONT_FAMILY   = 0x0002, ///< @SINCE_1_2_2
+      POINT_SIZE    = 0x0004, ///< @SINCE_1_2_2
+      FONT_STYLE    = 0x0008, ///< @SINCE_1_2_2
+      UNDERLINE     = 0x0010, ///< @SINCE_1_2_2
+      SHADOW        = 0x0020, ///< @SINCE_1_2_2
+      EMBOSS        = 0x0040, ///< @SINCE_1_2_2
+      OUTLINE       = 0x0080, ///< @SINCE_1_2_2
+      STRIKETHROUGH = 0x1000
     };
   };
 
@@ -522,6 +523,15 @@ public:
   static TextField New();
 
   /**
+   * @brief Creates the TextField control with additional behaviour.
+   *
+   * @SINCE_2_2.3
+   * @param[in] additionalBehaviour Additional control behaviour
+   * @return A handle to the TextField control
+   */
+  static TextField New(ControlBehaviour additionalBehaviour);
+
+  /**
    * @brief Creates an empty handle.
    * @SINCE_1_0.0
    */
@@ -541,7 +551,7 @@ public:
    *
    * @param[in] rhs A reference to the moved handle
    */
-  TextField(TextField&& rhs);
+  TextField(TextField&& rhs) noexcept;
 
   /**
    * @brief Assignment operator.
@@ -559,7 +569,7 @@ public:
    * @param[in] rhs A reference to the moved handle
    * @return A reference to this
    */
-  TextField& operator=(TextField&& rhs);
+  TextField& operator=(TextField&& rhs) noexcept;
 
   /**
    * @brief Destructor.