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 "Support multiple window rendering" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
layouting
/
layout-size.h
diff --git
a/dali-toolkit/devel-api/layouting/layout-size.h
b/dali-toolkit/devel-api/layouting/layout-size.h
index
b7ec71e
..
d025ea7
100644
(file)
--- a/
dali-toolkit/devel-api/layouting/layout-size.h
+++ b/
dali-toolkit/devel-api/layouting/layout-size.h
@@
-31,12
+31,12
@@
class LayoutSize
{
public:
LayoutSize()
{
public:
LayoutSize()
- : x(
0u
),
- y(
0u
)
+ : x(
0
),
+ y(
0
)
{
}
{
}
- LayoutSize( LayoutLength
::IntType anX, LayoutLength::IntType
aY )
+ LayoutSize( LayoutLength
anX, LayoutLength
aY )
: x( anX ),
y( aY )
{
: x( anX ),
y( aY )
{
@@
-55,31
+55,24
@@
public:
return *this;
}
return *this;
}
-
LayoutLength::IntType GetWidth(
)
+
void SetWidth( LayoutLength value
)
{
{
-
return width
;
+
width = value
;
}
}
- LayoutLength
::IntType GetHeight
()
+ LayoutLength
GetWidth
()
{
{
- return
height
;
+ return
width
;
}
}
- void SetWidth(LayoutLength::IntType value)
- {
- width=value;
- }
- void SetHeight(LayoutLength::IntType value)
+ void SetHeight( LayoutLength value )
{
{
- height
=
value;
+ height
=
value;
}
}
- void SetWidth(LayoutLength value)
- {
- width=value.mValue;
- }
- void SetHeight(LayoutLength value)
+
+ LayoutLength GetHeight()
{
{
-
height=value.mValue
;
+
return height
;
}
bool operator==( const LayoutSize& rhs )
}
bool operator==( const LayoutSize& rhs )
@@
-94,14
+87,14
@@
public:
union
{
union
{
- LayoutLength
::IntType
x;
- LayoutLength
::IntType
width;
+ LayoutLength x;
+ LayoutLength width;
};
union
{
};
union
{
- LayoutLength
::IntType
y;
- LayoutLength
::IntType
height;
+ LayoutLength y;
+ LayoutLength height;
};
};
};
};