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
Revert "[Tizen] Restore behavior of Uploaded and LoadingFinished signal"
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
layouting
/
vbox-layout-impl.cpp
diff --git
a/dali-toolkit/internal/layouting/vbox-layout-impl.cpp
b/dali-toolkit/internal/layouting/vbox-layout-impl.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
7e33107
..
22fba16
--- a/
dali-toolkit/internal/layouting/vbox-layout-impl.cpp
+++ b/
dali-toolkit/internal/layouting/vbox-layout-impl.cpp
@@
-233,7
+233,7
@@
void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La
auto width = right - left;
// Space available for child
auto width = right - left;
// Space available for child
- auto childSpace = width -
(int)padding.start - (int)
padding.end;
+ auto childSpace = width -
padding.start -
padding.end;
auto count = GetChildCount();
for( unsigned int childIndex = 0; childIndex < count; childIndex++)
auto count = GetChildCount();
for( unsigned int childIndex = 0; childIndex < count; childIndex++)
@@
-248,10
+248,10
@@
void VboxLayout::OnLayout( bool changed, LayoutLength left, LayoutLength top, La
auto childMargin = childLayout->GetMargin();
childTop += childMargin.top;
auto childMargin = childLayout->GetMargin();
childTop += childMargin.top;
- childLeft = ( childSpace - childWidth ) / 2 +
(int)childMargin.start - (int)
childMargin.end;
+ childLeft = ( childSpace - childWidth ) / 2 +
childMargin.start -
childMargin.end;
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
childLayout->Layout( childLeft, childTop, childLeft + childWidth, childTop + childHeight );
- childTop += childHeight +
(int)
childMargin.bottom + mCellPadding.height;
+ childTop += childHeight + childMargin.bottom + mCellPadding.height;
}
}
}
}
}
}