X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fvisual-transitions%2Ftransition-application.cpp;h=be75a6352d472368053841296117c3792bec62f7;hb=1a473d5189ca7e7d55aca3a64a8a4ff2dc3b6c67;hp=b721341fc627b849b2631ddb26c476726dc3acae;hpb=694dced621016315f10a5bdbd3f4552f5e29e380;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp index b721341..be75a63 100644 --- a/examples/visual-transitions/transition-application.cpp +++ b/examples/visual-transitions/transition-application.cpp @@ -129,7 +129,7 @@ void TransitionApplication::Create( Application& application ) mVisualButtons[i].SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::WIDTH ); mVisualButtons[i].SetResizePolicy( ResizePolicy::FIXED, Dimension::HEIGHT ); mVisualIndex = mVisualButtons[i].RegisterProperty( "visualId", i, Property::READ_WRITE ); - mVisualButtons[i].TouchSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked ); + mVisualButtons[i].TouchedSignal().Connect( this, &TransitionApplication::OnVisualButtonClicked ); visualTypeLayout.AddChild( mVisualButtons[i], TableView::CellPosition( 0, i ) ); } @@ -276,9 +276,9 @@ void TransitionApplication::CreateVisualMap( int index, Property::Map& map ) } } -bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchData& touchData ) +bool TransitionApplication::OnVisualButtonClicked( Actor actor, const TouchEvent& touch ) { - if( touchData.GetState(0) == PointState::FINISHED ) + if( touch.GetState(0) == PointState::FINISHED ) { int visual = actor.GetProperty( mVisualIndex ); Property::Map map; @@ -324,23 +324,23 @@ void TransitionApplication::OnKeyEvent( const KeyEvent& keyEvent ) { static int keyPressed = 0; - if( keyEvent.state == KeyEvent::Down) + if( keyEvent.GetState() == KeyEvent::DOWN) { if( keyPressed == 0 ) // Is this the first down event? { - printf("Key pressed: %s %d\n", keyEvent.keyPressedName.c_str(), keyEvent.keyCode ); + printf("Key pressed: %s %d\n", keyEvent.GetKeyName().c_str(), keyEvent.GetKeyCode() ); if( IsKey( keyEvent, DALI_KEY_ESCAPE) || IsKey( keyEvent, DALI_KEY_BACK ) ) { mApplication.Quit(); } - else if( keyEvent.keyPressedName.compare("Return") == 0 ) + else if( keyEvent.GetKeyName().compare("Return") == 0 ) { } } keyPressed = 1; } - else if( keyEvent.state == KeyEvent::Up ) + else if( keyEvent.GetState() == KeyEvent::UP ) { keyPressed = 0; }