X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=examples%2Fscroll-view%2Fscroll-view-example.cpp;h=effe45866a853acd4e8fe3aad0d21453d85ff1ca;hb=1a473d5189ca7e7d55aca3a64a8a4ff2dc3b6c67;hp=bee21c7d545d49b3696f035e97f1e07b875c1cbc;hpb=31fe26eea3e2d2a1cd7cbef08afdee5befe4242d;p=platform%2Fcore%2Fuifw%2Fdali-demo.git diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index bee21c7..effe458 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -188,7 +188,7 @@ public: // Create a effect change button. (right of toolbar) mEffectChangeButton = Toolkit::PushButton::New(); mEffectChangeButton.ClickedSignal().Connect( this, &ExampleController::OnEffectTouched ); - mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HorizontalRight, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); + mToolBar.AddControl( mEffectChangeButton, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarButtonPercentage, Toolkit::Alignment::HORIZONTAL_RIGHT, DemoHelper::DEFAULT_MODE_SWITCH_PADDING ); // Create the content layer. AddContentLayer(); @@ -469,7 +469,7 @@ private: actor.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::CENTER); actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::CENTER); - actor.TouchSignal().Connect( this, &ExampleController::OnTouchImage ); + actor.TouchedSignal().Connect( this, &ExampleController::OnTouchImage ); return actor; } @@ -536,7 +536,7 @@ private: { mTitleActor = DemoHelper::CreateToolBarLabel( "" ); // Add title to the tool bar. - mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HorizontalCenter ); + mToolBar.AddControl( mTitleActor, DemoHelper::DEFAULT_VIEW_STYLE.mToolBarTitlePercentage, Alignment::HORIZONTAL_CENTER ); } mTitleActor.SetProperty( Toolkit::TextLabel::Property::TEXT, title ); @@ -547,7 +547,7 @@ private: */ void OnKeyEvent(const KeyEvent& event) { - if(event.GetState() == KeyEvent::Down) + if(event.GetState() == KeyEvent::DOWN) { if( IsKey( event, Dali::DALI_KEY_ESCAPE) || IsKey( event, Dali::DALI_KEY_BACK) ) {