* limitations under the License.
*/
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
#include <dali-toolkit/devel-api/layouting/layout-length.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
namespace Dali
{
/**
* Class that encodes a measurement and a measure state, which is set if the measured size is too small.
*/
-class DALI_IMPORT_API MeasuredSize
+class DALI_TOOLKIT_API MeasuredSize
{
public:
};
MeasuredSize()
- : mMeasuredSize( 0u ),
+ : mMeasuredSize( 0 ),
mState ( MeasuredSize::State::MEASURED_SIZE_OK )
{
}
MeasuredSize& operator=( const MeasuredSize& rhs )
{
- this->mMeasuredSize = rhs.mMeasuredSize;
- this->mState = rhs.mState;
+ if( this != &rhs )
+ {
+ this->mMeasuredSize = rhs.mMeasuredSize;
+ this->mState = rhs.mState;
+ }
return *this;
}
- MeasuredSize& operator=( LayoutLength::IntType rhs )
+ MeasuredSize& operator=( LayoutLength rhs )
{
this->mMeasuredSize = rhs;
this->mState = State::MEASURED_SIZE_OK;
return mMeasuredSize != value.mMeasuredSize;
}
- inline operator LayoutLength::IntType()
- {
- return mMeasuredSize.mValue;
- }
-
inline void SetState( MeasuredSize::State state )
{
mState = state;