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
Merge "[ATSPI] Implementation of Hypertext and Hyperlink in text controls" into devel...
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
text-controls
/
text-editor.h
diff --git
a/dali-toolkit/public-api/controls/text-controls/text-editor.h
b/dali-toolkit/public-api/controls/text-controls/text-editor.h
index
fdda010
..
81eb8d3
100644
(file)
--- a/
dali-toolkit/public-api/controls/text-controls/text-editor.h
+++ b/
dali-toolkit/public-api/controls/text-controls/text-editor.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_TEXT_EDITOR_H__
-#define
__DALI_TOOLKIT_TEXT_EDITOR_H__
+#ifndef
DALI_TOOLKIT_TEXT_EDITOR_H
+#define
DALI_TOOLKIT_TEXT_EDITOR_H
/*
/*
- * Copyright (c) 20
17
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.
@@
-23,10
+23,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
class TextEditor;
namespace Internal DALI_INTERNAL
{
class TextEditor;
@@
-46,10
+44,9
@@
class TextEditor;
* | inputStyleChanged | @ref InputStyleChangedSignal() | @SINCE_1_2_2 |
*
*/
* | inputStyleChanged | @ref InputStyleChangedSignal() | @SINCE_1_2_2 |
*
*/
-class DALI_
IMPOR
T_API TextEditor : public Control
+class DALI_
TOOLKI
T_API TextEditor : public Control
{
public:
{
public:
-
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_1.37
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_1.37
@@
-57,7
+54,7
@@
public:
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1,
- PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserve property indices
+ PROPERTY_END_INDEX
= PROPERTY_START_INDEX + 1000
///< Reserve property indices
};
/**
};
/**
@@
-73,18
+70,11
@@
public:
enum
{
/**
enum
{
/**
- * @brief The type or rendering e.g. bitmap-based.
- * @details Name "renderingBackend", type Property::INTEGER.
- * @SINCE_1_1.37
- */
- RENDERING_BACKEND = PROPERTY_START_INDEX,
-
- /**
* @brief The text to display in UTF-8 format.
* @details Name "text", type Property::STRING.
* @SINCE_1_1.37
*/
* @brief The text to display in UTF-8 format.
* @details Name "text", type Property::STRING.
* @SINCE_1_1.37
*/
- TEXT,
+ TEXT
= PROPERTY_START_INDEX
,
/**
* @brief The text color.
/**
* @brief The text color.
@@
-301,9
+291,7
@@
public:
INPUT_LINE_SPACING,
/**
INPUT_LINE_SPACING,
/**
- * @brief The default underline parameters.
- * @details Name "underline", type Property::MAP.
- * @SINCE_1_2.13
+ * @copydoc Dali::Toolkit::TextLabel::Property::UNDERLINE
*/
UNDERLINE,
*/
UNDERLINE,
@@
-315,9
+303,7
@@
public:
INPUT_UNDERLINE,
/**
INPUT_UNDERLINE,
/**
- * @brief The default shadow parameters.
- * @details Name "shadow", type Property::MAP.
- * @SINCE_1_2.13
+ * @copydoc Dali::Toolkit::TextLabel::Property::SHADOW
*/
SHADOW,
*/
SHADOW,
@@
-343,9
+329,7
@@
public:
INPUT_EMBOSS,
/**
INPUT_EMBOSS,
/**
- * @brief The default outline parameters.
- * @details Name "outline", type Property::MAP.
- * @SINCE_1_2.13
+ * @copydoc Dali::Toolkit::TextLabel::Property::OUTLINE
*/
OUTLINE,
*/
OUTLINE,
@@
-459,10
+443,10
@@
public:
*/
struct InputStyle
{
*/
struct InputStyle
{
- /**
- * @brief Enumeration for mask used by the signal InputStyleChangedSignal().
- * @SINCE_1_2_2
- */
+
/**
+
* @brief Enumeration for mask used by the signal InputStyleChangedSignal().
+
* @SINCE_1_2_2
+
*/
enum Mask
{
NONE = 0x0000, ///< @SINCE_1_2_2
enum Mask
{
NONE = 0x0000, ///< @SINCE_1_2_2
@@
-492,8
+476,8
@@
public:
*/
enum Type
{
*/
enum Type
{
- STARTED,
///< Scrolling has started. @SINCE_1_2.60
- FINISHED
///< Scrolling has finished. @SINCE_1_2.60
+ STARTED, ///< Scrolling has started. @SINCE_1_2.60
+ FINISHED ///< Scrolling has finished. @SINCE_1_2.60
};
};
};
};
@@
-503,19
+487,19
@@
public:
* @brief Text changed signal type.
* @SINCE_1_1.37
*/
* @brief Text changed signal type.
* @SINCE_1_1.37
*/
- typedef Signal<void
( TextEditor )
> TextChangedSignalType;
+ typedef Signal<void
(TextEditor)
> TextChangedSignalType;
/**
* @brief Input Style changed signal type.
* @SINCE_1_2_2
*/
/**
* @brief Input Style changed signal type.
* @SINCE_1_2_2
*/
- typedef Signal<void
( TextEditor, InputStyle::Mask )
> InputStyleChangedSignalType;
+ typedef Signal<void
(TextEditor, InputStyle::Mask)
> InputStyleChangedSignalType;
/**
* @brief Scroll state changed signal type.
* @SINCE_1_2.60
*/
/**
* @brief Scroll state changed signal type.
* @SINCE_1_2.60
*/
- typedef Signal<
void ( TextEditor, Scroll::Type )
> ScrollStateChangedSignalType;
+ typedef Signal<
void(TextEditor, Scroll::Type)
> ScrollStateChangedSignalType;
/**
* @brief Creates the TextEditor control.
/**
* @brief Creates the TextEditor control.
@@
-523,7
+507,8
@@
public:
* @SINCE_1_1.37
* @return A handle to the TextEditor control
*/
* @SINCE_1_1.37
* @return A handle to the TextEditor control
*/
- static TextEditor New();
+ static TextEditor
+ New();
/**
* @brief Creates an empty handle.
/**
* @brief Creates an empty handle.
@@
-538,7
+523,15
@@
public:
* @SINCE_1_1.37
* @param[in] handle The handle to copy from
*/
* @SINCE_1_1.37
* @param[in] handle The handle to copy from
*/
- TextEditor( const TextEditor& handle );
+ TextEditor(const TextEditor& handle);
+
+ /**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ TextEditor(TextEditor&& rhs);
/**
* @brief Assignment operator.
/**
* @brief Assignment operator.
@@
-547,7
+540,16
@@
public:
* @param[in] handle The handle to copy from
* @return A reference to this
*/
* @param[in] handle The handle to copy from
* @return A reference to this
*/
- TextEditor& operator=( const TextEditor& handle );
+ TextEditor& operator=(const TextEditor& handle);
+
+ /**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ TextEditor& operator=(TextEditor&& rhs);
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-567,7
+569,8
@@
public:
* @param[in] handle Handle to an object
* @return Handle to a TextEditor or an empty handle
*/
* @param[in] handle Handle to an object
* @return Handle to a TextEditor or an empty handle
*/
- static TextEditor DownCast( BaseHandle handle );
+ static TextEditor
+ DownCast(BaseHandle handle);
// Signals
// Signals
@@
-582,7
+585,8
@@
public:
* @SINCE_1_1.37
* @return The signal to connect to
*/
* @SINCE_1_1.37
* @return The signal to connect to
*/
- TextChangedSignalType& TextChangedSignal();
+ TextChangedSignalType&
+ TextChangedSignal();
/**
* @brief This signal is emitted when the input style is updated as a consequence of a change in the cursor position.
/**
* @brief This signal is emitted when the input style is updated as a consequence of a change in the cursor position.
@@
-596,7
+600,8
@@
public:
* @SINCE_1_2_2
* @return The signal to connect to
*/
* @SINCE_1_2_2
* @return The signal to connect to
*/
- InputStyleChangedSignalType& InputStyleChangedSignal();
+ InputStyleChangedSignalType&
+ InputStyleChangedSignal();
/**
* @brief This signal is emitted when TextEditor scrolling is started or finished.
/**
* @brief This signal is emitted when TextEditor scrolling is started or finished.
@@
-610,10
+615,10
@@
public:
* @SINCE_1_2.60
* @return The signal to connect to
*/
* @SINCE_1_2.60
* @return The signal to connect to
*/
- ScrollStateChangedSignalType& ScrollStateChangedSignal();
+ ScrollStateChangedSignalType&
+ ScrollStateChangedSignal();
public: // Not intended for application developers
public: // Not intended for application developers
-
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
/// @cond internal
/**
* @brief Creates a handle using the Toolkit::Internal implementation.
@@
-621,7
+626,8
@@
public: // Not intended for application developers
* @SINCE_1_1.37
* @param[in] implementation The Control implementation
*/
* @SINCE_1_1.37
* @param[in] implementation The Control implementation
*/
- DALI_INTERNAL TextEditor( Internal::TextEditor& implementation );
+ DALI_INTERNAL
+ TextEditor(Internal::TextEditor& implementation);
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
/**
* @brief Allows the creation of this Control from an Internal::CustomActor pointer.
@@
-629,7
+635,8
@@
public: // Not intended for application developers
* @SINCE_1_1.37
* @param[in] internal A pointer to the internal CustomActor
*/
* @SINCE_1_1.37
* @param[in] internal A pointer to the internal CustomActor
*/
- explicit DALI_INTERNAL TextEditor( Dali::Internal::CustomActor* internal );
+ explicit DALI_INTERNAL
+ TextEditor(Dali::Internal::CustomActor* internal);
/// @endcond
};
/// @endcond
};
@@
-640,4
+647,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_TEXT_EDITOR_H__
+#endif //
DALI_TOOLKIT_TEXT_EDITOR_H