Merge "Support animation of Visual transform properties" 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 c31037f..718b5e4 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
 
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2018 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,8 +24,10 @@
 
 // INTERNAL INCLUDES
 #include <dali-toolkit/internal/visuals/visual-base-impl.h>
-#include <dali-toolkit/internal/visuals/visual-resource-observer.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
 {
@@ -43,8 +45,10 @@ struct Base::Impl
 {
   /**
    * 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
@@ -53,7 +57,7 @@ struct Base::Impl
 
   enum Flags
   {
-    IS_ON_STAGE = 1,
+    IS_ON_SCENE = 1,
     IS_ATLASING_APPLIED = 1<<1,
     IS_PREMULTIPLIED_ALPHA = 1 << 2,
     IS_SYNCHRONOUS_RESOURCE_LOADING = 1 << 3
@@ -108,24 +112,31 @@ struct Base::Impl
 
     Vector2 mOffset;
     Vector2 mSize;
+    Vector2 mExtraSize;
     Vector4 mOffsetSizeMode;
     Toolkit::Align::Type mOrigin;
     Toolkit::Align::Type mAnchorPoint;
+    Property::Index      mOffsetIndex;
+    Property::Index      mSizeIndex;
   };
 
   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
+  EventObserver*  mEventObserver;  ///< Allows controls to observe when the visual has events to notify
   std::string     mName;
   Transform       mTransform;
   Vector4         mMixColor;
   Size            mControlSize;
-  float           mDepthIndex;
+  float           mCornerRadius;
+  float           mCornerRadiusPolicy;
+  int             mDepthIndex;
   Property::Index mMixColorIndex;
-  Property::Index mOpacityIndex;
+  Property::Index mCornerRadiusIndex;
+  FittingMode     mFittingMode;  //< How the contents should fit the view
   int             mFlags;
-  bool            mResourceReady:1;
+  Toolkit::Visual::ResourceStatus  mResourceStatus;
+  const Toolkit::Visual::Type      mType;
+  bool                             mNeedCornerRadius;
 };
 
 } // namespace Visual