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.4.16] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
layout-item-data-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/layout-item-data-impl.cpp
b/dali-toolkit/internal/layouting/layout-item-data-impl.cpp
index
cd0460d
..
e6e41b6
100644
(file)
--- a/
dali-toolkit/internal/layouting/layout-item-data-impl.cpp
+++ b/
dali-toolkit/internal/layouting/layout-item-data-impl.cpp
@@
-24,17
+24,19
@@
namespace Toolkit
namespace Internal
{
namespace Internal
{
-
bool LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec = false
;
+
class LayoutData
;
+bool LayoutItem::Impl::sUseZeroUnspecifiedMeasureSpec = false;
+LayoutData* LayoutItem::Impl::sLayoutData = nullptr;
LayoutItem::Impl::Impl()
LayoutItem::Impl::Impl()
-: mOwner(
nullptr
),
+: mOwner(),
mLayoutParent( nullptr ),
mLayoutParent( nullptr ),
- mOldWidthMeasureSpec( 0
u
),
- mOldHeightMeasureSpec( 0
u
),
+ mOldWidthMeasureSpec( 0 ),
+ mOldHeightMeasureSpec( 0 ),
mMinimumSize(),
mMinimumSize(),
- mMeasuredWidth(0
u
),
- mMeasuredHeight(0
u
),
+ mMeasuredWidth(0),
+ mMeasuredHeight(0),
mLeft( 0 ),
mRight( 0 ),
mTop( 0 ),
mLeft( 0 ),
mRight( 0 ),
mTop( 0 ),