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 "Update text layout utcs" 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
374ff68
..
b6f75ee
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
7
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
8
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-114,7
+114,7
@@
bool GetPolicyFromValue( const Property::Value& value, Vector2& policy )
} // unnamed namespace
} // unnamed namespace
-Internal::Visual::Base::Impl::Impl()
+Internal::Visual::Base::Impl::Impl(
FittingMode fittingMode
)
: mCustomShader( NULL ),
mBlendSlotDelegate( NULL ),
mResourceObserver( NULL ),
: mCustomShader( NULL ),
mBlendSlotDelegate( NULL ),
mResourceObserver( NULL ),
@@
-124,6
+124,7
@@
Internal::Visual::Base::Impl::Impl()
mDepthIndex( 0.0f ),
mMixColorIndex( Property::INVALID_INDEX ),
mOpacityIndex( Property::INVALID_INDEX ),
mDepthIndex( 0.0f ),
mMixColorIndex( Property::INVALID_INDEX ),
mOpacityIndex( Property::INVALID_INDEX ),
+ mFittingMode( fittingMode ),
mFlags( 0 ),
mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING )
{
mFlags( 0 ),
mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING )
{