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 "Do not substarct outline width in text-controller" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
measured-size.h
diff --git
a/dali-toolkit/devel-api/layouting/measured-size.h
b/dali-toolkit/devel-api/layouting/measured-size.h
index
68f988c
..
f04be0a
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/measured-size.h
+++ b/
dali-toolkit/devel-api/layouting/measured-size.h
@@
-19,6
+19,7
@@
#include <dali/public-api/common/dali-common.h>
#include <dali-toolkit/devel-api/layouting/layout-length.h>
#include <dali/public-api/common/dali-common.h>
#include <dali-toolkit/devel-api/layouting/layout-length.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
namespace Dali
{
namespace Dali
{
@@
-28,7
+29,7
@@
namespace Toolkit
/**
* Class that encodes a measurement and a measure state, which is set if the measured size is too small.
*/
/**
* Class that encodes a measurement and a measure state, which is set if the measured size is too small.
*/
-class DALI_
IMPOR
T_API MeasuredSize
+class DALI_
TOOLKI
T_API MeasuredSize
{
public:
{
public:
@@
-39,7
+40,7
@@
public:
};
MeasuredSize()
};
MeasuredSize()
- : mMeasuredSize( 0
u
),
+ : mMeasuredSize( 0 ),
mState ( MeasuredSize::State::MEASURED_SIZE_OK )
{
}
mState ( MeasuredSize::State::MEASURED_SIZE_OK )
{
}
@@
-60,12
+61,15
@@
public:
MeasuredSize& operator=( const MeasuredSize& rhs )
{
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;
}
return *this;
}
- MeasuredSize& operator=( LayoutLength
::IntType
rhs )
+ MeasuredSize& operator=( LayoutLength rhs )
{
this->mMeasuredSize = rhs;
this->mState = State::MEASURED_SIZE_OK;
{
this->mMeasuredSize = rhs;
this->mState = State::MEASURED_SIZE_OK;
@@
-82,11
+86,6
@@
public:
return mMeasuredSize != value.mMeasuredSize;
}
return mMeasuredSize != value.mMeasuredSize;
}
- inline operator LayoutLength::IntType()
- {
- return mMeasuredSize.mValue;
- }
-
inline void SetState( MeasuredSize::State state )
{
mState = state;
inline void SetState( MeasuredSize::State state )
{
mState = state;