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 "Removing unused variables" into devel/master
[platform/core/uifw/dali-demo.git]
/
examples
/
gaussian-blur-view
/
gaussian-blur-view-example.cpp
diff --git
a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp
index
b3651d0
..
bd1c807
100644
(file)
--- a/
examples/gaussian-blur-view/gaussian-blur-view-example.cpp
+++ b/
examples/gaussian-blur-view/gaussian-blur-view-example.cpp
@@
-113,7
+113,7
@@
private:
window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
}
window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch );
}
- bool OnTouch( Actor actor, const Touch
Data
& touch )
+ bool OnTouch( Actor actor, const Touch
Event
& touch )
{
const PointState::Type state = touch.GetState( 0 );
{
const PointState::Type state = touch.GetState( 0 );
@@
-142,7
+142,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) )
{