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
[dali_1.2.65] Merge branch '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
..
79c099c
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
7
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,8
@@
// 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-resource-observer.h>
+#include <dali-toolkit/public-api/align-enumerations.h>
namespace Dali
{
namespace Dali
{
@@
-53,10
+54,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
@@
-116,13
+116,16
@@
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
+ ResourceObserver* mResourceObserver; ///< Allows controls to observe when the visual resources are loaded and ready
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
std::string mName;
Transform mTransform;
Vector4 mMixColor;
Size mControlSize;
-
float
mDepthIndex;
+
int
mDepthIndex;
Property::Index mMixColorIndex;
Property::Index mMixColorIndex;
+ Property::Index mOpacityIndex;
int mFlags;
int mFlags;
+ Toolkit::Visual::ResourceStatus mResourceStatus;
};
} // namespace Visual
};
} // namespace Visual