projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Fixed crash issue by null reference" into devel/master
[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
ac76e78
..
f335ce7
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,6
+123,11
@@
public:
private: // From Control
/**
private: // From Control
/**
+ * @copydoc Toolkit::Control::OnInitialize
+ */
+ void OnInitialize();
+
+ /**
* @copydoc Toolkit::Control::GetNaturalSize
*/
virtual Vector3 GetNaturalSize();
* @copydoc Toolkit::Control::GetNaturalSize
*/
virtual Vector3 GetNaturalSize();
@@
-143,6
+148,14
@@
private: // From Control
virtual void OnRelayout( const Vector2& size, RelayoutContainer& container );
private:
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& );
// Undefined
ImageView( const ImageView& );
ImageView& operator=( const ImageView& );