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 "Updated patch coverage script." 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
1b6afa3
..
a1056ac
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-57,7
+57,7
@@
struct Base::Impl
enum Flags
{
enum Flags
{
- IS_ON_S
TAG
E = 1,
+ IS_ON_S
CEN
E = 1,
IS_ATLASING_APPLIED = 1<<1,
IS_PREMULTIPLIED_ALPHA = 1 << 2,
IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
IS_ATLASING_APPLIED = 1<<1,
IS_PREMULTIPLIED_ALPHA = 1 << 2,
IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
@@
-120,13
+120,13
@@
struct Base::Impl
Renderer mRenderer;
CustomShader* mCustomShader;
Renderer mRenderer;
CustomShader* mCustomShader;
- SlotDelegate<Visual::Base>* mBlendSlotDelegate; ///< Used to own mix color animation connection
EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
float mCornerRadius;
EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
float mCornerRadius;
+ float mCornerRadiusPolicy;
int mDepthIndex;
Property::Index mMixColorIndex;
Property::Index mCornerRadiusIndex;
int mDepthIndex;
Property::Index mMixColorIndex;
Property::Index mCornerRadiusIndex;
@@
-134,6
+134,7
@@
struct Base::Impl
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
const Toolkit::Visual::Type mType;
+ bool mNeedCornerRadius;
};
} // namespace Visual
};
} // namespace Visual