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
[AT-SPI] Squashed implementation
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
buttons
/
button.h
diff --git
a/dali-toolkit/public-api/controls/buttons/button.h
b/dali-toolkit/public-api/controls/buttons/button.h
index
2544d46
..
f41e641
100644
(file)
--- a/
dali-toolkit/public-api/controls/buttons/button.h
+++ b/
dali-toolkit/public-api/controls/buttons/button.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_BUTTON_H
/*
#define DALI_TOOLKIT_BUTTON_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.
@@
-23,10
+23,8
@@
namespace Dali
{
namespace Dali
{
-
namespace Toolkit
{
namespace Toolkit
{
-
namespace Internal DALI_INTERNAL
{
class Button;
namespace Internal DALI_INTERNAL
{
class Button;
@@
-88,7
+86,6
@@
class Button;
class DALI_TOOLKIT_API Button : public Control
{
public:
class DALI_TOOLKIT_API Button : public Control
{
public:
-
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_0.0
/**
* @brief Enumeration for the start and end property ranges for this control.
* @SINCE_1_0.0
@@
-96,7
+93,7
@@
public:
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_0.0
enum PropertyRange
{
PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< @SINCE_1_0.0
- PROPERTY_END_INDEX
=
PROPERTY_START_INDEX + 1000 ///< Reserve property indices @SINCE_1_0.0
+ PROPERTY_END_INDEX
=
PROPERTY_START_INDEX + 1000 ///< Reserve property indices @SINCE_1_0.0
};
/**
};
/**
@@
-218,7
+215,6
@@
public:
};
public:
};
public:
-
/**
* @brief Creates an uninitialized Button.
*
/**
* @brief Creates an uninitialized Button.
*
@@
-233,7
+229,15
@@
public:
* @SINCE_1_0.0
* @param[in] button Handle to an object
*/
* @SINCE_1_0.0
* @param[in] button Handle to an object
*/
- Button( const Button& button );
+ Button(const Button& button);
+
+ /**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ Button(Button&& rhs);
/**
* @brief Assignment operator.
/**
* @brief Assignment operator.
@@
-241,7
+245,16
@@
public:
* @param[in] button Handle to an object
* @return A reference to this
*/
* @param[in] button Handle to an object
* @return A reference to this
*/
- Button& operator=( const Button& button );
+ Button& operator=(const Button& button);
+
+ /**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ Button& operator=(Button&& rhs);
/**
* @brief Downcasts a handle to Button handle.
/**
* @brief Downcasts a handle to Button handle.
@@
-253,7
+266,7
@@
public:
* @param[in] handle Handle to an object
* @return A handle to a Button or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return A handle to a Button or an uninitialized handle
*/
- static Button DownCast(
BaseHandle handle
);
+ static Button DownCast(
BaseHandle handle
);
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-264,12
+277,11
@@
public:
~Button();
public: //Signals
~Button();
public: //Signals
-
/**
* @brief Button signal type.
* @SINCE_1_0.0
*/
/**
* @brief Button signal type.
* @SINCE_1_0.0
*/
- typedef Signal<
bool ( Button )
> ButtonSignalType;
+ typedef Signal<
bool(Button)
> ButtonSignalType;
/**
* @brief This signal is emitted when the button is touched.
/**
* @brief This signal is emitted when the button is touched.
@@
-322,7
+334,6
@@
public: //Signals
ButtonSignalType& StateChangedSignal();
public: // Not intended for application developers
ButtonSignalType& StateChangedSignal();
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.
@@
-330,7
+341,7
@@
public: // Not intended for application developers
* @SINCE_1_0.0
* @param[in] implementation The Control implementation
*/
* @SINCE_1_0.0
* @param[in] implementation The Control implementation
*/
- DALI_INTERNAL Button(
Internal::Button& implementation
);
+ DALI_INTERNAL Button(
Internal::Button& 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.
@@
-338,7
+349,7
@@
public: // Not intended for application developers
* @SINCE_1_0.0
* @param[in] internal A pointer to the internal CustomActor
*/
* @SINCE_1_0.0
* @param[in] internal A pointer to the internal CustomActor
*/
- DALI_INTERNAL Button(
Dali::Internal::CustomActor* internal
);
+ DALI_INTERNAL Button(
Dali::Internal::CustomActor* internal
);
/// @endcond
};
/// @endcond
};