X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=fd2420517de5581364e02e36f9357c88a64385f0;hb=1e5f8e03bf0dfd40c9efd641d915dd1173eae4e5;hp=8b235f8a08c7010a088b860fe709e31147029654;hpb=39d4d89a9cc3bcd134922827d7009b2188fe7ffe;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 8b235f8..fd24205 100644 --- 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 /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -24,7 +24,9 @@ // INTERNAL INCLUDES #include -#include +#include +#include +#include namespace Dali { @@ -115,14 +117,16 @@ struct Base::Impl Renderer mRenderer; CustomShader* mCustomShader; SlotDelegate* 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; - float mDepthIndex; + int mDepthIndex; Property::Index mMixColorIndex; Property::Index mOpacityIndex; int mFlags; + Toolkit::Visual::ResourceStatus mResourceStatus; }; } // namespace Visual