X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fprogress-bar%2Fprogress-bar.h;h=b466d2de77a4b7d96edc1eeaacdc94101d6e9064;hb=HEAD;hp=ed4ceb2d7629b99126022adf553971b7fd2a7e9d;hpb=c5348b4691e24b20264fc8ad92a881f0118bb540;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h index ed4ceb2..66c24a5 100644 --- a/dali-toolkit/public-api/controls/progress-bar/progress-bar.h +++ b/dali-toolkit/public-api/controls/progress-bar/progress-bar.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_PROGRESS_BAR_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -23,10 +23,8 @@ namespace Dali { - namespace Toolkit { - namespace Internal DALI_INTERNAL { class ProgressBar; @@ -47,10 +45,9 @@ class ProgressBar; * @SINCE_1_2.60 */ -class DALI_IMPORT_API ProgressBar : public Control +class DALI_TOOLKIT_API ProgressBar : public Control { public: - // Properties /** @@ -60,7 +57,7 @@ public: enum PropertyRange { PROPERTY_START_INDEX = Control::CONTROL_PROPERTY_END_INDEX + 1, ///< Start Index. @SINCE_1_2.60 - PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserve property indices. @SINCE_1_2.60 + PROPERTY_END_INDEX = PROPERTY_START_INDEX + 1000 ///< Reserve property indices. @SINCE_1_2.60 }; /** @@ -156,9 +153,8 @@ public: }; public: - /** - * @brief Creates the ProgressBar control. + * @brief Creates the ProgressBar control. It creates a horizontal linear shape of progress bar. * @SINCE_1_2.60 * @return A handle to the ProgressBar control */ @@ -177,7 +173,15 @@ public: * @SINCE_1_2.60 * @param[in] handle Handle to an object */ - ProgressBar( const ProgressBar& handle ); + ProgressBar(const ProgressBar& handle); + + /** + * @brief Move constructor + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + */ + ProgressBar(ProgressBar&& rhs) noexcept; /** * @brief Assignment operator. @@ -187,7 +191,16 @@ public: * @param[in] handle Handle to an object * @return A reference to this */ - ProgressBar& operator=( const ProgressBar& handle ); + ProgressBar& operator=(const ProgressBar& handle); + + /** + * @brief Move assignment + * @SINCE_1_9.23 + * + * @param[in] rhs A reference to the moved handle + * @return A reference to this + */ + ProgressBar& operator=(ProgressBar&& rhs) noexcept; /** * @brief Destructor. @@ -206,15 +219,14 @@ public: * @param[in] handle Handle to an object * @return handle to a ProgressBar or an uninitialized handle */ - static ProgressBar DownCast( BaseHandle handle ); - -public: // Signals + static ProgressBar DownCast(BaseHandle handle); +public: // Signals /** * @brief Value changed signal type. * @SINCE_1_2.60 */ - typedef Signal< void ( ProgressBar, float, float ) > ValueChangedSignalType; + typedef Signal ValueChangedSignalType; /** * @brief Signal emitted when the ProgressBar value changes. @@ -229,7 +241,6 @@ public: // Signals ValueChangedSignalType& ValueChangedSignal(); public: // Not intended for application developers - /// @cond internal /** * @brief Creates a handle using the Toolkit::Internal implementation. @@ -241,7 +252,7 @@ public: // Not intended for application developers * @brief Allows the creation of this Control from an Internal::CustomActor pointer. * @param[in] internal A pointer to the internal CustomActor */ - explicit DALI_INTERNAL ProgressBar( Dali::Internal::CustomActor* internal ); + explicit DALI_INTERNAL ProgressBar(Dali::Internal::CustomActor* internal); /// @endcond };