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
Support animation of Visual transform properties
[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
1f59ec0
..
718b5e4
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-24,7
+24,7
@@
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/visuals/visual-base-impl.h>
-#include <dali-toolkit/internal/visuals/visual-
resource
-observer.h>
+#include <dali-toolkit/internal/visuals/visual-
event
-observer.h>
#include <dali-toolkit/public-api/align-enumerations.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
#include <dali-toolkit/public-api/align-enumerations.h>
#include <dali-toolkit/public-api/visuals/visual-properties.h>
#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
@@
-46,8
+46,9
@@
struct Base::Impl
/**
* Constructor
* @param [in] fittingMode that the derived class prefers
/**
* Constructor
* @param [in] fittingMode that the derived class prefers
+ * @param [in] type The type of the this visual
*/
*/
- Impl(
FittingMode fittingMode
);
+ Impl(
FittingMode fittingMode, Toolkit::Visual::Type type
);
/**
* Destructor
/**
* Destructor
@@
-56,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
@@
-111,24
+112,31
@@
struct Base::Impl
Vector2 mOffset;
Vector2 mSize;
Vector2 mOffset;
Vector2 mSize;
+ Vector2 mExtraSize;
Vector4 mOffsetSizeMode;
Toolkit::Align::Type mOrigin;
Toolkit::Align::Type mAnchorPoint;
Vector4 mOffsetSizeMode;
Toolkit::Align::Type mOrigin;
Toolkit::Align::Type mAnchorPoint;
+ Property::Index mOffsetIndex;
+ Property::Index mSizeIndex;
};
Renderer mRenderer;
CustomShader* mCustomShader;
};
Renderer mRenderer;
CustomShader* mCustomShader;
- SlotDelegate<Visual::Base>* mBlendSlotDelegate; ///< Used to own mix color animation connection
- ResourceObserver* mResourceObserver; ///< Allows controls to observe when the visual resources are loaded and ready
+ EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
+ float mCornerRadius;
+ float mCornerRadiusPolicy;
int mDepthIndex;
Property::Index mMixColorIndex;
int mDepthIndex;
Property::Index mMixColorIndex;
+ Property::Index mCornerRadiusIndex;
FittingMode mFittingMode; //< How the contents should fit the view
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
FittingMode mFittingMode; //< How the contents should fit the view
int mFlags;
Toolkit::Visual::ResourceStatus mResourceStatus;
+ const Toolkit::Visual::Type mType;
+ bool mNeedCornerRadius;
};
} // namespace Visual
};
} // namespace Visual