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 "Add tc log to check a failure" 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
999b41c
..
1b6afa3
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
6
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,7
+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/devel-api/align-enums.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>
namespace Dali
{
namespace Dali
{
@@
-42,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,10
+58,9
@@
struct Base::Impl
enum Flags
{
IS_ON_STAGE = 1,
enum Flags
{
IS_ON_STAGE = 1,
- IS_FROM_CACHE = 1 << 1,
- IS_ATLASING_APPLIED = 1<<2,
- IS_PREMULTIPLIED_ALPHA = 1 << 3,
- IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 4
+ IS_ATLASING_APPLIED = 1<<1,
+ IS_PREMULTIPLIED_ALPHA = 1 << 2,
+ IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
};
struct CustomShader
};
struct CustomShader
@@
-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;
@@
-116,13
+121,19
@@
struct Base::Impl
Renderer mRenderer;
CustomShader* mCustomShader;
SlotDelegate<Visual::Base>* mBlendSlotDelegate; ///< Used to own mix color animation connection
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;
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
- float mDepthIndex;
+ float mCornerRadius;
+ int mDepthIndex;
Property::Index mMixColorIndex;
Property::Index mMixColorIndex;
+ Property::Index mCornerRadiusIndex;
+ FittingMode mFittingMode; //< How the contents should fit the view
int mFlags;
int mFlags;
+ Toolkit::Visual::ResourceStatus mResourceStatus;
+ const Toolkit::Visual::Type mType;
};
} // namespace Visual
};
} // namespace Visual