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 "Fix to do not remove entity inside loop.(Transition)" 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
90dc192
..
023930e
100644
(file)
--- a/
dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/
dali-toolkit/internal/controls/image-view/image-view-impl.h
@@
-133,6
+133,11
@@
private: // From Control
*/
void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
*/
void OnRelayout(const Vector2& size, RelayoutContainer& container) override;
+ /**
+ * @copydoc Toolkit::Control::OnCreateTransitions()
+ */
+ virtual void OnCreateTransitions(Dali::Animation& animation, Dali::Toolkit::Control source, AlphaFunction alphaFunction, TimePeriod timePeriod) override;
+
private:
/**
* @brief Callback for ResourceReadySignal
private:
/**
* @brief Callback for ResourceReadySignal