projects
/
platform
/
core
/
uifw
/
dali-demo.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Updates following rename of PropertyBuffer" into devel/master
[platform/core/uifw/dali-demo.git]
/
examples
/
scroll-view
/
scroll-view-example.cpp
diff --git
a/examples/scroll-view/scroll-view-example.cpp
b/examples/scroll-view/scroll-view-example.cpp
index
ab7789a
..
bee21c7
100644
(file)
--- a/
examples/scroll-view/scroll-view-example.cpp
+++ b/
examples/scroll-view/scroll-view-example.cpp
@@
-499,7
+499,7
@@
private:
* @param[in] actor The actor touched
* @param[in] event The touch information.
*/
* @param[in] actor The actor touched
* @param[in] event The touch information.
*/
- bool OnTouchImage( Actor actor, const Touch
Data
& event )
+ bool OnTouchImage( Actor actor, const Touch
Event
& event )
{
if( (event.GetPointCount() > 0) && (!mScrolling) )
{
{
if( (event.GetPointCount() > 0) && (!mScrolling) )
{
@@
-547,7
+547,7
@@
private:
*/
void OnKeyEvent(const KeyEvent& event)
{
*/
void OnKeyEvent(const KeyEvent& event)
{
- if(event.
state
== KeyEvent::Down)
+ if(event.
GetState()
== KeyEvent::Down)
{
if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
{
{
if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) )
{