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 "WebEngine::GetNativeImageSource return NativeImageSourcePtr" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
visuals
/
visual-base-data-impl.h
diff --git
a/dali-toolkit/internal/visuals/visual-base-data-impl.h
b/dali-toolkit/internal/visuals/visual-base-data-impl.h
index
52e0d98
..
64ab52f
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-134,12
+134,12
@@
struct Base::Impl
Property::Index mBorderlineColorIndex;
Property::Index mBorderlineOffsetIndex;
Property::Index mCornerRadiusIndex;
Property::Index mBorderlineColorIndex;
Property::Index mBorderlineOffsetIndex;
Property::Index mCornerRadiusIndex;
- FittingMode mFittingMode; //< How the contents should fit the view
+ FittingMode mFittingMode; //
/
< How the contents should fit the view
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
- bool m
NeedCornerRadius;
- bool m
NeedBorderline;
+ bool m
AlwaysUsingBorderline : 1; ///< Whether we need the borderline in shader always.
+ bool m
AlwaysUsingCornerRadius : 1; ///< Whether we need the corner radius in shader always.
};
} // namespace Visual
};
} // namespace Visual