X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=4adcc5a6e78b6b37d7bfa9ea7eb2ad01802c931d;hp=3ce75aaa8bd9e1781ca083af2cb7b887d6b2e4d7;hb=49c3f1cd96c162f764c5fd9fc4fbd9a5f0e2d769;hpb=a0a28eb90260b017d231b0a2ff993825405fd058 diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index 3ce75aa..4adcc5a 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -24,7 +24,7 @@ // INTERNAL INCLUDES #include -#include +#include #include #include #include @@ -119,14 +119,13 @@ 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 + EventObserver* mEventObserver; ///< Allows controls to observe when the visual has events to notify std::string mName; Transform mTransform; Vector4 mMixColor; Size mControlSize; int mDepthIndex; Property::Index mMixColorIndex; - Property::Index mOpacityIndex; FittingMode mFittingMode; //< How the contents should fit the view int mFlags; Toolkit::Visual::ResourceStatus mResourceStatus;