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.30] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
public-api
/
controls
/
scrollable
/
scrollable.h
diff --git
a/dali-toolkit/public-api/controls/scrollable/scrollable.h
b/dali-toolkit/public-api/controls/scrollable/scrollable.h
index
b369321
..
a12e3c2
100644
(file)
--- a/
dali-toolkit/public-api/controls/scrollable/scrollable.h
+++ b/
dali-toolkit/public-api/controls/scrollable/scrollable.h
@@
-1,8
+1,8
@@
-#ifndef
__DALI_TOOLKIT_SCROLLABLE_H__
-#define
__DALI_TOOLKIT_SCROLLABLE_H__
+#ifndef
DALI_TOOLKIT_SCROLLABLE_H
+#define
DALI_TOOLKIT_SCROLLABLE_H
/*
/*
- * Copyright (c) 20
18
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 Scrollable;
namespace Internal DALI_INTERNAL
{
class Scrollable;
@@
-53,7
+51,6
@@
class Scrollable;
class DALI_TOOLKIT_API Scrollable : public Control
{
public:
class DALI_TOOLKIT_API Scrollable : 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
@@
-61,10
+58,10
@@
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
ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
ANIMATABLE_PROPERTY_START_INDEX = ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX,
- ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices @SINCE_1_0.0
+ ANIMATABLE_PROPERTY_END_INDEX
= ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000
///< Reserve animatable property indices @SINCE_1_0.0
};
/**
};
/**
@@
-101,12
+98,11
@@
public:
// Typedefs
// Typedefs
- typedef Signal<
void ( const Vector2& )
> ScrollStartedSignalType; ///< ScrollStarted signal type @SINCE_1_0.0
- typedef Signal<
void ( const Vector2& )
> ScrollCompletedSignalType; ///< ScrollCompleted signal type @SINCE_1_0.0
- typedef Signal<
void ( const Vector2& )
> ScrollUpdatedSignalType; ///< Scroll updated signal type @SINCE_1_0.0
+ typedef Signal<
void(const Vector2&)
> ScrollStartedSignalType; ///< ScrollStarted signal type @SINCE_1_0.0
+ typedef Signal<
void(const Vector2&)
> ScrollCompletedSignalType; ///< ScrollCompleted signal type @SINCE_1_0.0
+ typedef Signal<
void(const Vector2&)
> ScrollUpdatedSignalType; ///< Scroll updated signal type @SINCE_1_0.0
public:
public:
-
/**
* @brief Creates an uninitialized Scrollable handle.
* @SINCE_1_0.0
/**
* @brief Creates an uninitialized Scrollable handle.
* @SINCE_1_0.0
@@
-121,7
+117,15
@@
public:
* @SINCE_1_0.0
* @param handle to copy from
*/
* @SINCE_1_0.0
* @param handle to copy from
*/
- Scrollable( const Scrollable& handle );
+ Scrollable(const Scrollable& handle);
+
+ /**
+ * @brief Move constructor
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ */
+ Scrollable(Scrollable&& rhs);
/**
* @brief Assignment operator.
/**
* @brief Assignment operator.
@@
-131,7
+135,16
@@
public:
* @param[in] handle Handle to copy from
* @return A reference to this
*/
* @param[in] handle Handle to copy from
* @return A reference to this
*/
- Scrollable& operator=( const Scrollable& handle );
+ Scrollable& operator=(const Scrollable& handle);
+
+ /**
+ * @brief Move assignment
+ * @SINCE_1_9.23
+ *
+ * @param[in] rhs A reference to the moved handle
+ * @return A reference to this
+ */
+ Scrollable& operator=(Scrollable&& rhs);
/**
* @brief Destructor.
/**
* @brief Destructor.
@@
-151,7
+164,7
@@
public:
* @param[in] handle Handle to an object
* @return A handle to a Scrollable or an uninitialized handle
*/
* @param[in] handle Handle to an object
* @return A handle to a Scrollable or an uninitialized handle
*/
- static Scrollable DownCast(
BaseHandle handle
);
+ static Scrollable DownCast(
BaseHandle handle
);
/**
* @brief Checks if scroll overshoot has been enabled or not.
/**
* @brief Checks if scroll overshoot has been enabled or not.
@@
-175,7
+188,7
@@
public:
* @SINCE_1_0.0
* @param[in] color The color of the overshoot effect
*/
* @SINCE_1_0.0
* @param[in] color The color of the overshoot effect
*/
- void SetOvershootEffectColor(
const Vector4& color
);
+ void SetOvershootEffectColor(
const Vector4& color
);
/**
* @brief Gets the color of the overshoot effect.
/**
* @brief Gets the color of the overshoot effect.
@@
-191,7
+204,7
@@
public:
* @SINCE_1_0.0
* @param[in] pixelsPerSecond The speed of the overshoot animation
*/
* @SINCE_1_0.0
* @param[in] pixelsPerSecond The speed of the overshoot animation
*/
- void SetOvershootAnimationSpeed(
float pixelsPerSecond
);
+ void SetOvershootAnimationSpeed(
float pixelsPerSecond
);
/**
* @brief Gets the speed of overshoot animation in pixels per second.
/**
* @brief Gets the speed of overshoot animation in pixels per second.
@@
-201,7
+214,6
@@
public:
float GetOvershootAnimationSpeed() const;
public: // Signals
float GetOvershootAnimationSpeed() const;
public: // Signals
-
/**
* @brief Signal emitted when the Scrollable has moved (whether by touch or animation).
*
/**
* @brief Signal emitted when the Scrollable has moved (whether by touch or animation).
*
@@
-242,7
+254,6
@@
public: // Signals
ScrollCompletedSignalType& ScrollCompletedSignal();
public: // Not intended for application developers
ScrollCompletedSignalType& ScrollCompletedSignal();
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.
@@
-258,7
+269,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
*/
- explicit DALI_INTERNAL Scrollable(
Dali::Internal::CustomActor* internal
);
+ explicit DALI_INTERNAL Scrollable(
Dali::Internal::CustomActor* internal
);
/// @endcond
};
/// @endcond
};
@@
-269,4
+280,4
@@
public: // Not intended for application developers
} // namespace Dali
} // namespace Dali
-#endif //
__DALI_TOOLKIT_SCROLLABLE_H__
+#endif //
DALI_TOOLKIT_SCROLLABLE_H