Merge branch 'devel/master (1.2.49)' into tizen

[platform/core/uifw/dali-toolkit.git] / dali-toolkit / internal / controls / image-view / image-view-impl.h

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index 22b91bf..dc449e9 100644 (file)
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -123,9 +123,9 @@ public:
 private: // From Control
 
   /**
-   * @copydoc CustomActorImpl::OnStageConnection()
+   * @copydoc Toolkit::Control::OnInitialize
    */
-  virtual void OnStageConnection( int depth );
+  void OnInitialize();
 
   /**
    * @copydoc Toolkit::Control::GetNaturalSize
@@ -148,6 +148,14 @@ private: // From Control
   virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
 
 private:
+
+  /**
+   * @brief Callback for ResourceReadySignal
+   * param[in] control signal prototype
+   */
+  void OnResourceReady( Toolkit::Control control );
+
+private:
   // Undefined
   ImageView( const ImageView& );
   ImageView& operator=( const ImageView& );
@@ -158,6 +166,7 @@ private:
   std::string      mUrl;          ///< the url for the image if the image came from a URL, empty otherwise
   Image            mImage;        ///< the Image if the image came from a Image, null otherwise
   Property::Map    mPropertyMap;  ///< the Property::Map if the image came from a Property::Map, empty otherwise
+  bool             mRelayoutRequired; ///< True if relayout is required, e.g. due to unreadiness
 };
 
 } // namespace Internal