X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=ca311e11e2e2f988f1fe1d6641e10af9f4c97b28;hb=ab5c560f8956e7b795b7cc2072d06a61aef103b7;hp=8b235f8a08c7010a088b860fe709e31147029654;hpb=4159297affa73892be1ef11d1119e0bb301b276c;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..ca311e1 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,6 +24,7 @@ // INTERNAL INCLUDES #include +#include #include namespace Dali @@ -115,14 +116,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; + bool mResourceReady:1; }; } // namespace Visual