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 "Remove .clang-format file from toolkit/automated-tests" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.cpp
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp
index
bb3f8d0
..
8106899
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@
-119,16
+119,23
@@
Internal::Visual::Base::Impl::Impl(FittingMode fittingMode, Toolkit::Visual::Typ
mTransform(),
mMixColor(Color::WHITE),
mControlSize(Vector2::ZERO),
mTransform(),
mMixColor(Color::WHITE),
mControlSize(Vector2::ZERO),
- mCornerRadius(0.0f),
+ mBorderlineWidth(0.0f),
+ mBorderlineColor(Color::BLACK),
+ mBorderlineOffset(0.0f),
+ mCornerRadius(Vector4::ZERO),
mCornerRadiusPolicy(1.0f),
mDepthIndex(0.0f),
mMixColorIndex(Property::INVALID_INDEX),
mCornerRadiusPolicy(1.0f),
mDepthIndex(0.0f),
mMixColorIndex(Property::INVALID_INDEX),
+ mBorderlineWidthIndex(Property::INVALID_INDEX),
+ mBorderlineColorIndex(Property::INVALID_INDEX),
+ mBorderlineOffsetIndex(Property::INVALID_INDEX),
mCornerRadiusIndex(Property::INVALID_INDEX),
mFittingMode(fittingMode),
mFlags(0),
mResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
mType(type),
mCornerRadiusIndex(Property::INVALID_INDEX),
mFittingMode(fittingMode),
mFlags(0),
mResourceStatus(Toolkit::Visual::ResourceStatus::PREPARING),
mType(type),
- mNeedCornerRadius(false)
+ mAlwaysUsingBorderline(false),
+ mAlwaysUsingCornerRadius(false)
{
}
{
}