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
Async image loading
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
popup
/
popup-impl.h
diff --git
a/dali-toolkit/internal/controls/popup/popup-impl.h
b/dali-toolkit/internal/controls/popup/popup-impl.h
index
91d68b7
..
cc5a2f6
100755
(executable)
--- a/
dali-toolkit/internal/controls/popup/popup-impl.h
+++ b/
dali-toolkit/internal/controls/popup/popup-impl.h
@@
-396,10
+396,10
@@
private:
/**
* Signal occurs when the dimmed backing for the Popup is touched.
* @param[in] actor The Actor Touched
/**
* Signal occurs when the dimmed backing for the Popup is touched.
* @param[in] actor The Actor Touched
- * @param[in]
event The Touch Event
.
+ * @param[in]
touch The Touch Data
.
* @return Whether to consume event or not.
*/
* @return Whether to consume event or not.
*/
- bool OnBackingTouched(Actor actor, const Touch
Event& event
);
+ bool OnBackingTouched(Actor actor, const Touch
Data& touch
);
/**
* Signal occurs when a mouse wheel event occurs on the dimmed backing.
/**
* Signal occurs when a mouse wheel event occurs on the dimmed backing.
@@
-412,10
+412,10
@@
private:
/**
* Signal occurs when the dialog has been touched.
* @param[in] actor The Actor Touched
/**
* Signal occurs when the dialog has been touched.
* @param[in] actor The Actor Touched
- * @param[in]
event The Touch Event
.
+ * @param[in]
touch The Touch Data
.
* @return Whether to consume event or not.
*/
* @return Whether to consume event or not.
*/
- bool OnDialogTouched(
Actor actor, const TouchEvent& event
);
+ bool OnDialogTouched(
Actor actor, const TouchData& touch
);
/**
* @copydoc Toolkit::Control::OnInitialize()
/**
* @copydoc Toolkit::Control::OnInitialize()