projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[dali_1.9.23] 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
133b2c7
..
b705039
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
/*
#define DALI_TOOLKIT_TEXT_FIELD_H
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-73,18
+73,11
@@
public:
enum
{
/**
enum
{
/**
- * @brief The type or rendering e.g. bitmap-based.
- * @details Name "renderingBackend", type Property::INTEGER.
- * @SINCE_1_0.0
- */
- RENDERING_BACKEND = PROPERTY_START_INDEX,
-
- /**
* @brief The text to display in UTF-8 format.
* @details Name "text", type Property::STRING.
* @SINCE_1_0.0
*/
* @brief The text to display in UTF-8 format.
* @details Name "text", type Property::STRING.
* @SINCE_1_0.0
*/
- TEXT,
+ TEXT
= PROPERTY_START_INDEX
,
/**
* @brief The text to display when the TextField is empty and inactive.
/**
* @brief The text to display when the TextField is empty and inactive.
@@
-169,16
+162,6
@@
public:
PLACEHOLDER_TEXT_COLOR,
/**
PLACEHOLDER_TEXT_COLOR,
/**
- * @brief This property is removed because it's deprecated.
- */
- RESERVED_PROPERTY_01,
-
- /**
- * @brief This property is removed because it's deprecated.
- */
- RESERVED_PROPERTY_02,
-
- /**
* @brief The color to apply to the primary cursor.
* @details Name "primaryCursorColor", type Property::VECTOR4.
* @SINCE_1_0.0
* @brief The color to apply to the primary cursor.
* @details Name "primaryCursorColor", type Property::VECTOR4.
* @SINCE_1_0.0
@@
-472,7
+455,7
@@
public:
* @SINCE_1_2.60
* @note PLACEHOLDER map is used to add ellipsis to placeholder text.
*/
* @SINCE_1_2.60
* @note PLACEHOLDER map is used to add ellipsis to placeholder text.
*/
- ELLIPSIS
,
+ ELLIPSIS
};
};
};
};
@@
-556,6
+539,14
@@
public:
TextField( const TextField& handle );
/**
TextField( const TextField& handle );
/**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ TextField( TextField&& rhs );
+
+ /**
* @brief Assignment operator.
*
* @SINCE_1_0.0
* @brief Assignment operator.
*
* @SINCE_1_0.0
@@
-565,6
+556,15
@@
public:
TextField& operator=( const TextField& handle );
/**
TextField& operator=( const TextField& handle );
/**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ TextField& operator=( TextField&& rhs );
+
+ /**
* @brief Destructor.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.
* @brief Destructor.
*
* This is non-virtual since derived Handle types must not contain data or virtual methods.