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
(TextController) Refactored out Text updating methods & moved another method to the...
[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
1d92f6e
..
ae7a93e
100644
(file)
--- a/
dali-toolkit/internal/visuals/visual-base-data-impl.h
+++ b/
dali-toolkit/internal/visuals/visual-base-data-impl.h
@@
-2,7
+2,7
@@
#define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H
/*
#define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H
/*
- * 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.
@@
-24,8
+24,10
@@
// 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/align-enumerations.h>
+#include <dali-toolkit/public-api/visuals/visual-properties.h>
+#include <dali-toolkit/devel-api/visuals/visual-properties-devel.h>
namespace Dali
{
namespace Dali
{
@@
-43,8
+45,10
@@
struct Base::Impl
{
/**
* Constructor
{
/**
* Constructor
+ * @param [in] fittingMode that the derived class prefers
+ * @param [in] type The type of the this visual
*/
*/
- Impl();
+ Impl(
FittingMode fittingMode, Toolkit::Visual::Type type
);
/**
* Destructor
/**
* Destructor
@@
-53,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
@@
-108,6
+112,7
@@
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;
@@
-115,17
+120,20
@@
struct Base::Impl
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 mOpacityIndex;
+ Property::Index mCornerRadiusIndex;
+ FittingMode mFittingMode; //< How the contents should fit the view
int mFlags;
int mFlags;
- bool mResourceReady:1;
+ Toolkit::Visual::ResourceStatus mResourceStatus;
+ const Toolkit::Visual::Type mType;
};
} // namespace Visual
};
} // namespace Visual