From: Adeel Kazmi Date: Wed, 2 Sep 2020 13:55:34 +0000 (+0100) Subject: Changes after TouchedSignal changes X-Git-Tag: dali_1.9.28~3 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-demo.git;a=commitdiff_plain;h=1a473d5189ca7e7d55aca3a64a8a4ff2dc3b6c67 Changes after TouchedSignal changes Change-Id: I2969e88887c684a556c7372ca7f4e07abc3969fa --- diff --git a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp index e4efeac..4080037 100644 --- a/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp +++ b/examples/alpha-blending-cpu/alpha-blending-cpu-example.cpp @@ -80,7 +80,7 @@ private: LoadImages(); - window.TouchSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched ); + window.TouchedSignal().Connect( this, &ImageViewAlphaBlendApp::OnTouched ); } void OnTouched( const TouchEvent& touch ) diff --git a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp index 696f1a9..a4da888 100644 --- a/examples/animated-gradient-card-active/animated-gradient-card-active.cpp +++ b/examples/animated-gradient-card-active/animated-gradient-card-active.cpp @@ -308,7 +308,7 @@ public: SetupActors(); SetupAnimation(); - mWindow.GetRootLayer().TouchSignal().Connect( this, &CardController::OnTouchLayer ); + mWindow.GetRootLayer().TouchedSignal().Connect( this, &CardController::OnTouchLayer ); Reset(); } @@ -583,7 +583,7 @@ private: mCards.Init( mWindow ); for( int k = 0; k < CARD_NUM; k++ ) { - mCards[k].TouchSignal().Connect( this, &CardController::OnTouchCards ); + mCards[k].TouchedSignal().Connect( this, &CardController::OnTouchCards ); } mNormalStartColor = mCards.GetColorBackground( mCards.mCurIndex ); mNormalEndColor = mCards.GetColorBackground( mCards.mCurIndex ); diff --git a/examples/arc-visual/arc-visual-example.cpp b/examples/arc-visual/arc-visual-example.cpp index 708f7d5..3a1aa95 100644 --- a/examples/arc-visual/arc-visual-example.cpp +++ b/examples/arc-visual/arc-visual-example.cpp @@ -117,7 +117,7 @@ private: mStartAngleLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mStartAngleLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mStartAngleLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) ); - mStartAngleLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); + mStartAngleLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); window.Add( mStartAngleLabel ); mSweepAngleLabel = TextLabel::New( "2" ); @@ -128,7 +128,7 @@ private: mSweepAngleLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mSweepAngleLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mSweepAngleLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) ); - mSweepAngleLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); + mSweepAngleLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); window.Add( mSweepAngleLabel ); mThicknessLabel = TextLabel::New( "3" ); @@ -139,7 +139,7 @@ private: mThicknessLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mThicknessLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mThicknessLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) ); - mThicknessLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); + mThicknessLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); window.Add( mThicknessLabel ); mPlusTextLabel = TextLabel::New( "+" ); @@ -150,7 +150,7 @@ private: mPlusTextLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mPlusTextLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mPlusTextLabel.SetProperty( Control::Property::PADDING, Extents( 20.0f, 20.0f, 10.0f, 10.0f ) ); - mPlusTextLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); + mPlusTextLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); window.Add( mPlusTextLabel ); mMinusTextLabel = TextLabel::New( "-" ); @@ -161,11 +161,11 @@ private: mMinusTextLabel.SetProperty( Actor::Property::WIDTH_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mMinusTextLabel.SetProperty( Actor::Property::HEIGHT_RESIZE_POLICY, ResizePolicy::USE_NATURAL_SIZE ); mMinusTextLabel.SetProperty( Control::Property::PADDING, Extents( 25.0f, 25.0f, 10.0f, 10.0f ) ); - mMinusTextLabel.TouchSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); + mMinusTextLabel.TouchedSignal().Connect( this, &ArcVisualExample::OnButtonTouch ); window.Add( mMinusTextLabel ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &ArcVisualExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &ArcVisualExample::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &ArcVisualExample::OnKeyEvent ); diff --git a/examples/benchmark/benchmark.cpp b/examples/benchmark/benchmark.cpp index 2b7520b..b1d05d5 100644 --- a/examples/benchmark/benchmark.cpp +++ b/examples/benchmark/benchmark.cpp @@ -232,7 +232,7 @@ public: mSize = Vector3( windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &Benchmark::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &Benchmark::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &Benchmark::OnKeyEvent ); diff --git a/examples/bezier-curve/bezier-curve-example.cpp b/examples/bezier-curve/bezier-curve-example.cpp index d92bab9..07eb159 100644 --- a/examples/bezier-curve/bezier-curve-example.cpp +++ b/examples/bezier-curve/bezier-curve-example.cpp @@ -159,7 +159,7 @@ public: mContentLayer = Layer::New(); mContentLayer.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - mContentLayer.TouchSignal().Connect(this, &BezierCurveExample::OnTouchLayer); + mContentLayer.TouchedSignal().Connect(this, &BezierCurveExample::OnTouchLayer); mContentLayer.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); window.Add( mContentLayer ); @@ -330,7 +330,7 @@ public: constraint.AddSource( Source( parent, Actor::Property::SIZE ) ); constraint.Apply(); - actor.TouchSignal().Connect(this, &BezierCurveExample::OnTouchControlPoint); + actor.TouchedSignal().Connect(this, &BezierCurveExample::OnTouchControlPoint); return actor; } diff --git a/examples/blocks/blocks-example.cpp b/examples/blocks/blocks-example.cpp index 67ccb95..9018283 100644 --- a/examples/blocks/blocks-example.cpp +++ b/examples/blocks/blocks-example.cpp @@ -312,8 +312,8 @@ private: mPaddle.SetProperty( Actor::Property::POSITION, windowSize * Vector3( PADDLE_START_POSITION ) ); mContentLayer.Add(mPaddle); - mPaddle.TouchSignal().Connect(this, &ExampleController::OnTouchPaddle); - mContentLayer.TouchSignal().Connect(this, &ExampleController::OnTouchLayer); + mPaddle.TouchedSignal().Connect(this, &ExampleController::OnTouchPaddle); + mContentLayer.TouchedSignal().Connect(this, &ExampleController::OnTouchLayer); const float margin(BALL_SIZE.width * windowSize.width * 0.5f); diff --git a/examples/bubble-effect/bubble-effect-example.cpp b/examples/bubble-effect/bubble-effect-example.cpp index 802d117..a668384 100644 --- a/examples/bubble-effect/bubble-effect-example.cpp +++ b/examples/bubble-effect/bubble-effect-example.cpp @@ -147,7 +147,7 @@ private: mTimerForBubbleEmission.TickSignal().Connect(this, &BubbleEffectExample::OnTimerTick); // Connect the callback to the touch signal on the background - mBackground.TouchSignal().Connect( this, &BubbleEffectExample::OnTouch ); + mBackground.TouchedSignal().Connect( this, &BubbleEffectExample::OnTouch ); } diff --git a/examples/clipping-draw-order/clipping-draw-order.cpp b/examples/clipping-draw-order/clipping-draw-order.cpp index ac20cc1..0653f2a 100644 --- a/examples/clipping-draw-order/clipping-draw-order.cpp +++ b/examples/clipping-draw-order/clipping-draw-order.cpp @@ -198,7 +198,7 @@ public: window.Add( view ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &ClippingDrawOrderVerification::OnTouch ); } bool OnTouch( Actor actor, const TouchEvent& touch ) diff --git a/examples/color-visual/color-visual-example.cpp b/examples/color-visual/color-visual-example.cpp index 3ab4880..809fdae 100644 --- a/examples/color-visual/color-visual-example.cpp +++ b/examples/color-visual/color-visual-example.cpp @@ -80,7 +80,7 @@ public: window.Add( mImageView ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &ColorVisualExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &ColorVisualExample::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &ColorVisualExample::OnKeyEvent ); diff --git a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp index 2eb2b6b..cf081f5 100644 --- a/examples/compressed-texture-formats/compressed-texture-formats-example.cpp +++ b/examples/compressed-texture-formats/compressed-texture-formats-example.cpp @@ -177,7 +177,7 @@ public: window.Add( table ); // Respond to touch and key signals - window.GetRootLayer().TouchSignal().Connect( this, &CompressedTextureFormatsController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &CompressedTextureFormatsController::OnTouch ); window.KeyEventSignal().Connect(this, &CompressedTextureFormatsController::OnKeyEvent); } diff --git a/examples/fpp-game/fpp-game-tutorial-controller.cpp b/examples/fpp-game/fpp-game-tutorial-controller.cpp index 7ee29f1..28ae003 100644 --- a/examples/fpp-game/fpp-game-tutorial-controller.cpp +++ b/examples/fpp-game/fpp-game-tutorial-controller.cpp @@ -166,7 +166,7 @@ void FppGameTutorialController::DisplayTutorial( Dali::Window window ) void FppGameTutorialController::OnTutorialAnimationFinished( Animation& animation ) { // touch signal will wait for a single touch on each side of screen - mWindow.TouchSignal().Connect( this, &FppGameTutorialController::OnTouch ); + mWindow.TouchedSignal().Connect( this, &FppGameTutorialController::OnTouch ); } void FppGameTutorialController::OnTutorialComplete( Animation& animation ) diff --git a/examples/fpp-game/game-camera.cpp b/examples/fpp-game/game-camera.cpp index 2d33dc6..0b7255b 100644 --- a/examples/fpp-game/game-camera.cpp +++ b/examples/fpp-game/game-camera.cpp @@ -200,8 +200,8 @@ void GameCamera::CreateInterceptorActor() mInterceptorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mCameraActor.Add( mInterceptorActor ); - // Connect TouchSignal to interceptor actor - mInterceptorActor.TouchSignal().Connect( this, &GameCamera::OnTouch ); + // Connect TouchedSignal to interceptor actor + mInterceptorActor.TouchedSignal().Connect( this, &GameCamera::OnTouch ); } bool GameCamera::OnTouch( Actor actor, const TouchEvent& touch ) diff --git a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp index bd1c807..00aeb51 100644 --- a/examples/gaussian-blur-view/gaussian-blur-view-example.cpp +++ b/examples/gaussian-blur-view/gaussian-blur-view-example.cpp @@ -110,7 +110,7 @@ private: mGaussianBlurView.Add( mImageView ); mGaussianBlurView.SetProperty( mGaussianBlurView.GetBlurStrengthPropertyIndex(), mStrength ); - window.GetRootLayer().TouchSignal().Connect( this, &GaussianBlurViewExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &GaussianBlurViewExample::OnTouch ); } bool OnTouch( Actor actor, const TouchEvent& touch ) diff --git a/examples/gestures/gesture-example.cpp b/examples/gestures/gesture-example.cpp old mode 100755 new mode 100644 index 884c3f9..bd32658 --- a/examples/gestures/gesture-example.cpp +++ b/examples/gestures/gesture-example.cpp @@ -158,7 +158,7 @@ private: background.Add( touchControl ); // Connect to the touch signal - touchControl.TouchSignal().Connect( this, &GestureExample::OnTouch ); + touchControl.TouchedSignal().Connect( this, &GestureExample::OnTouch ); touchControl.SetProperty( Actor::Property::LEAVE_REQUIRED, true ); // Create a long press gesture detector, attach the actor & connect diff --git a/examples/hello-world/hello-world-example.cpp b/examples/hello-world/hello-world-example.cpp index ebf322e..1f3599a 100644 --- a/examples/hello-world/hello-world-example.cpp +++ b/examples/hello-world/hello-world-example.cpp @@ -48,7 +48,7 @@ public: window.Add( textLabel ); // Respond to a touch anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &HelloWorldController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &HelloWorldController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &HelloWorldController::OnKeyEvent ); diff --git a/examples/homescreen-benchmark/homescreen-benchmark.cpp b/examples/homescreen-benchmark/homescreen-benchmark.cpp index 56e601c..f710406 100644 --- a/examples/homescreen-benchmark/homescreen-benchmark.cpp +++ b/examples/homescreen-benchmark/homescreen-benchmark.cpp @@ -184,7 +184,7 @@ public: window.Add( mScrollParent ); // Respond to a click anywhere on the window. - window.GetRootLayer().TouchSignal().Connect( this, &HomescreenBenchmark::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &HomescreenBenchmark::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &HomescreenBenchmark::OnKeyEvent ); diff --git a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp old mode 100755 new mode 100644 index 8ffb9a8..981c6f0 --- a/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp +++ b/examples/image-scaling-and-filtering/image-scaling-and-filtering-example.cpp @@ -270,7 +270,7 @@ public: imagePrevious.SetProperty( Actor::Property::OPACITY, 0.6f ); controlsLayer.Add( imagePrevious ); imagePrevious.SetProperty( Dali::Actor::Property::NAME, PREVIOUS_BUTTON_ID ); - imagePrevious.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imagePrevious.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Next image button: Toolkit::ImageView imageNext = Toolkit::ImageView::New( DALI_ICON_PLAY, ImageDimensions( playWidth, playWidth ) ); @@ -280,7 +280,7 @@ public: imageNext.SetProperty( Actor::Property::OPACITY, 0.6f ); controlsLayer.Add( imageNext ); imageNext.SetProperty( Dali::Actor::Property::NAME, NEXT_BUTTON_ID ); - imageNext.TouchSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); + imageNext.TouchedSignal().Connect( this, &ImageScalingAndFilteringController::OnControlTouched ); // Buttons to popup selectors for fitting and sampling modes: diff --git a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp index 1bd7899..cb41669 100644 --- a/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp +++ b/examples/image-scaling-irregular-grid/image-scaling-irregular-grid-example.cpp @@ -477,7 +477,7 @@ public: ImageView image = CreateImageView( imageSource.configuration.path, imageSize.x, imageSize.y, fittingMode ); image.SetProperty( Actor::Property::POSITION, Vector3( imagePosition.x, imagePosition.y, 0 ) ); image.SetProperty( Actor::Property::SIZE, imageSize ); - image.TouchSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); + image.TouchedSignal().Connect( this, &ImageScalingIrregularGridController::OnTouchImage ); image.ResourceReadySignal().Connect( this, &ImageScalingIrregularGridController::ResourceReadySignal ); mFittingModes[image.GetProperty< int >( Actor::Property::ID )] = fittingMode; mResourceUrls[image.GetProperty< int >( Actor::Property::ID )] = imageSource.configuration.path; diff --git a/examples/magnifier/magnifier-example.cpp b/examples/magnifier/magnifier-example.cpp index 136c051..eadf675 100644 --- a/examples/magnifier/magnifier-example.cpp +++ b/examples/magnifier/magnifier-example.cpp @@ -211,7 +211,7 @@ public: APPLICATION_TITLE ); mContent.SetProperty( Actor::Property::LEAVE_REQUIRED,true); - mContent.TouchSignal().Connect( this, &ExampleController::OnTouched ); + mContent.TouchedSignal().Connect( this, &ExampleController::OnTouched ); // Create magnifier (controlled by human touch) Layer overlay = Layer::New(); diff --git a/examples/mesh-visual/mesh-visual-example.cpp b/examples/mesh-visual/mesh-visual-example.cpp index 17b9c1d..affde27 100644 --- a/examples/mesh-visual/mesh-visual-example.cpp +++ b/examples/mesh-visual/mesh-visual-example.cpp @@ -99,7 +99,7 @@ public: //Set up root layer to receive touch gestures. Layer rootLayer = window.GetRootLayer(); rootLayer.RegisterProperty( "Tag", LAYER_TAG ); //Used to differentiate between different kinds of actor. - rootLayer.TouchSignal().Connect( this, &MeshVisualController::OnTouch ); + rootLayer.TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); //Place models on the scene. SetupModels( rootLayer ); @@ -124,7 +124,7 @@ public: mContainers[i].SetResizePolicy( ResizePolicy::SIZE_RELATIVE_TO_PARENT, Dimension::ALL_DIMENSIONS ); mContainers[i].RegisterProperty( "Tag", MODEL_TAG ); //Used to differentiate between different kinds of actor. mContainers[i].RegisterProperty( "Model", Property::Value( i ) ); //Used to index into the model. - mContainers[i].TouchSignal().Connect( this, &MeshVisualController::OnTouch ); + mContainers[i].TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); layer.Add( mContainers[i] ); } @@ -280,7 +280,7 @@ public: SetLightImage(); //Connect to touch signal for dragging. - mLightSource.TouchSignal().Connect( this, &MeshVisualController::OnTouch ); + mLightSource.TouchedSignal().Connect( this, &MeshVisualController::OnTouch ); //Place the light source on a layer above the base, so that it is rendered above everything else. Layer upperLayer = Layer::New(); diff --git a/examples/metaball-explosion/metaball-explosion-example.cpp b/examples/metaball-explosion/metaball-explosion-example.cpp index 22b150f..92209c3 100644 --- a/examples/metaball-explosion/metaball-explosion-example.cpp +++ b/examples/metaball-explosion/metaball-explosion-example.cpp @@ -364,7 +364,7 @@ void MetaballExplosionController::Create( Application& app ) mTimerDispersion.TickSignal().Connect( this, &MetaballExplosionController::OnTimerDispersionTick ); // Connect the callback to the touch signal on the mesh actor - window.GetRootLayer().TouchSignal().Connect( this, &MetaballExplosionController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &MetaballExplosionController::OnTouch ); } Geometry MetaballExplosionController::CreateGeometry( bool aspectMappedTexture ) diff --git a/examples/metaball-refrac/metaball-refrac-example.cpp b/examples/metaball-refrac/metaball-refrac-example.cpp index 96134b4..021a2ac 100644 --- a/examples/metaball-refrac/metaball-refrac-example.cpp +++ b/examples/metaball-refrac/metaball-refrac-example.cpp @@ -338,7 +338,7 @@ void MetaballRefracController::Create( Application& app ) CreateAnimations(); // Connect the callback to the touch signal on the mesh actor - window.GetRootLayer().TouchSignal().Connect( this, &MetaballRefracController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &MetaballRefracController::OnTouch ); } Geometry MetaballRefracController::CreateGeometry( bool aspectMappedTexture ) diff --git a/examples/perf-scroll/perf-scroll.cpp b/examples/perf-scroll/perf-scroll.cpp index 8a7d2a0..ea9b633 100644 --- a/examples/perf-scroll/perf-scroll.cpp +++ b/examples/perf-scroll/perf-scroll.cpp @@ -233,7 +233,7 @@ public: mSize = Vector3( windowSize.x / mColumnsPerPage, windowSize.y / mRowsPerPage, 0.0f ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &PerfScroll::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &PerfScroll::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &PerfScroll::OnKeyEvent ); diff --git a/examples/ray-marching/ray-marching-example.cpp b/examples/ray-marching/ray-marching-example.cpp index 41b88bc..39caa42 100644 --- a/examples/ray-marching/ray-marching-example.cpp +++ b/examples/ray-marching/ray-marching-example.cpp @@ -116,7 +116,7 @@ public: // Get a handle to the window Window window = application.GetWindow(); - window.GetRootLayer().TouchSignal().Connect( this, &RayMarchingExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &RayMarchingExample::OnTouch ); window.KeyEventSignal().Connect(this, &RayMarchingExample::OnKeyEvent); diff --git a/examples/refraction-effect/refraction-effect-example.cpp b/examples/refraction-effect/refraction-effect-example.cpp index be8c636..b6eebe3 100644 --- a/examples/refraction-effect/refraction-effect-example.cpp +++ b/examples/refraction-effect/refraction-effect-example.cpp @@ -298,7 +298,7 @@ private: mContent.Add( mMeshActor ); // Connect the callback to the touch signal on the mesh actor - mContent.TouchSignal().Connect( this, &RefractionEffectExample::OnTouch ); + mContent.TouchedSignal().Connect( this, &RefractionEffectExample::OnTouch ); // shader used when the finger is touching the screen. render refraction effect mShaderRefraction = Shader::New( VERTEX_SHADER_REFRACTION, FRAGMENT_SHADER_REFRACTION ); diff --git a/examples/remote-image-loading/remote-image-loading-example.cpp b/examples/remote-image-loading/remote-image-loading-example.cpp index ae01d97..8952d81 100644 --- a/examples/remote-image-loading/remote-image-loading-example.cpp +++ b/examples/remote-image-loading/remote-image-loading-example.cpp @@ -45,7 +45,7 @@ public: void ConnectEventSignal(Control control) { - control.TouchSignal().Connect(this, &MyTester::OnControlTouch); + control.TouchedSignal().Connect(this, &MyTester::OnControlTouch); control.SetProperty( Actor::Property::KEYBOARD_FOCUSABLE,true); control.KeyEventSignal().Connect(this, &MyTester::OnControlKeyEvent); @@ -59,7 +59,7 @@ public: mWindow = application.GetWindow(); mWindow.SetBackgroundColor(Color::BLACK); mWindow.KeyEventSignal().Connect(this, &MyTester::OnKey); - mWindow.TouchSignal().Connect(this, &MyTester::OnTouch); + mWindow.TouchedSignal().Connect(this, &MyTester::OnTouch); TextLabel rubric = TextLabel::New( "You will need a working internet connection to see the images below"); rubric.SetProperty( TextLabel::Property::MULTI_LINE, true ); diff --git a/examples/renderer-stencil/renderer-stencil-example.cpp b/examples/renderer-stencil/renderer-stencil-example.cpp index 00df548..86e006b 100644 --- a/examples/renderer-stencil/renderer-stencil-example.cpp +++ b/examples/renderer-stencil/renderer-stencil-example.cpp @@ -255,7 +255,7 @@ private: mBounceAnimation.Play(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &RendererStencilExample::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &RendererStencilExample::OnTouch ); // Connect signals to allow Back and Escape to exit. window.KeyEventSignal().Connect( this, &RendererStencilExample::OnKeyEvent ); } diff --git a/examples/rendering-basic-light/rendering-basic-light-example.cpp b/examples/rendering-basic-light/rendering-basic-light-example.cpp index 7408ca7..b82d38d 100644 --- a/examples/rendering-basic-light/rendering-basic-light-example.cpp +++ b/examples/rendering-basic-light/rendering-basic-light-example.cpp @@ -194,7 +194,7 @@ public: PlayAnimation(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &BasicLightController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &BasicLightController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &BasicLightController::OnKeyEvent ); diff --git a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp index f09ff63..38c3ce2 100644 --- a/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp +++ b/examples/rendering-basic-pbr/rendering-basic-pbr-example.cpp @@ -126,7 +126,7 @@ public: InitActors(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &BasicPbrController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &BasicPbrController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &BasicPbrController::OnKeyEvent ); diff --git a/examples/rendering-cube/rendering-cube.cpp b/examples/rendering-cube/rendering-cube.cpp index 53e4d1a..23bf056 100644 --- a/examples/rendering-cube/rendering-cube.cpp +++ b/examples/rendering-cube/rendering-cube.cpp @@ -99,7 +99,7 @@ public: PlayAnimation(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &DrawCubeController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &DrawCubeController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &DrawCubeController::OnKeyEvent ); diff --git a/examples/rendering-line/rendering-line.cpp b/examples/rendering-line/rendering-line.cpp index 292d1a1..cd60254 100644 --- a/examples/rendering-line/rendering-line.cpp +++ b/examples/rendering-line/rendering-line.cpp @@ -92,7 +92,7 @@ public: CreateActor(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &DrawLineController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &DrawLineController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &DrawLineController::OnKeyEvent ); diff --git a/examples/rendering-radial-progress/radial-progress.cpp b/examples/rendering-radial-progress/radial-progress.cpp index a3dcbfd..614123d 100644 --- a/examples/rendering-radial-progress/radial-progress.cpp +++ b/examples/rendering-radial-progress/radial-progress.cpp @@ -152,7 +152,7 @@ public: animation.Play(); // 6. Exit the application when touched - window.GetRootLayer().TouchSignal().Connect( this, &RadialProgressController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &RadialProgressController::OnTouch ); } bool OnTouch( Actor actor, const TouchEvent& touch ) diff --git a/examples/rendering-skybox/look-camera.cpp b/examples/rendering-skybox/look-camera.cpp index 54f0c8a..00f38fc 100644 --- a/examples/rendering-skybox/look-camera.cpp +++ b/examples/rendering-skybox/look-camera.cpp @@ -143,8 +143,8 @@ void LookCamera::CreateInterceptorActor() mInterceptorActor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); mCameraActor.Add( mInterceptorActor ); - // Connect TouchSignal to interceptor actor - mInterceptorActor.TouchSignal().Connect( this, &LookCamera::OnTouch ); + // Connect TouchedSignal to interceptor actor + mInterceptorActor.TouchedSignal().Connect( this, &LookCamera::OnTouch ); } bool LookCamera::OnTouch( Actor actor, const TouchEvent& touch ) diff --git a/examples/rendering-textured-cube/rendering-textured-cube.cpp b/examples/rendering-textured-cube/rendering-textured-cube.cpp index affa485..b5f6430 100644 --- a/examples/rendering-textured-cube/rendering-textured-cube.cpp +++ b/examples/rendering-textured-cube/rendering-textured-cube.cpp @@ -105,7 +105,7 @@ public: PlayAnimation(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &TexturedCubeController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &TexturedCubeController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &TexturedCubeController::OnKeyEvent ); diff --git a/examples/rendering-triangle/rendering-triangle.cpp b/examples/rendering-triangle/rendering-triangle.cpp index 882eaf4..9a2b022 100644 --- a/examples/rendering-triangle/rendering-triangle.cpp +++ b/examples/rendering-triangle/rendering-triangle.cpp @@ -92,7 +92,7 @@ public: CreateActor(); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &DrawTriangleController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &DrawTriangleController::OnTouch ); // Respond to key events window.KeyEventSignal().Connect( this, &DrawTriangleController::OnKeyEvent ); diff --git a/examples/scroll-view/scroll-view-example.cpp b/examples/scroll-view/scroll-view-example.cpp index 16d0be4..effe458 100644 --- a/examples/scroll-view/scroll-view-example.cpp +++ b/examples/scroll-view/scroll-view-example.cpp @@ -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; } diff --git a/examples/text-field/text-field-example.cpp b/examples/text-field/text-field-example.cpp index 001a342..751380b 100644 --- a/examples/text-field/text-field-example.cpp +++ b/examples/text-field/text-field-example.cpp @@ -128,7 +128,7 @@ public: popup.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::HEIGHT ); - popup.TouchSignal().Connect( this, &TextFieldExample::OnPopupTouched ); + popup.TouchedSignal().Connect( this, &TextFieldExample::OnPopupTouched ); return popup; } diff --git a/examples/text-label-emojis/text-label-emojis.cpp b/examples/text-label-emojis/text-label-emojis.cpp index 9ec53d2..a9801e4 100644 --- a/examples/text-label-emojis/text-label-emojis.cpp +++ b/examples/text-label-emojis/text-label-emojis.cpp @@ -65,7 +65,7 @@ public: mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); mTableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); mTableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - mTableView.TouchSignal().Connect( this, &EmojiExample::OnTouch ); + mTableView.TouchedSignal().Connect( this, &EmojiExample::OnTouch ); window.Add( mTableView ); for( unsigned int index = 0u; index < NUMBER_OF_EMOJIS; ++index ) diff --git a/examples/text-label-multi-language/text-label-multi-language-example.cpp b/examples/text-label-multi-language/text-label-multi-language-example.cpp index 2ebb286..abe62fe 100644 --- a/examples/text-label-multi-language/text-label-multi-language-example.cpp +++ b/examples/text-label-multi-language/text-label-multi-language-example.cpp @@ -67,7 +67,7 @@ public: mTableView.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::HEIGHT ); mTableView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT ); mTableView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT ); - mTableView.TouchSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch ); + mTableView.TouchedSignal().Connect( this, &TextLabelMultiLanguageExample::OnTouch ); window.Add( mTableView ); for( unsigned int index = 0u; index < NUMBER_OF_LANGUAGES; ++index ) diff --git a/examples/tilt/tilt-example.cpp b/examples/tilt/tilt-example.cpp index b7d12f6..d9dd48b 100644 --- a/examples/tilt/tilt-example.cpp +++ b/examples/tilt/tilt-example.cpp @@ -56,7 +56,7 @@ public: window.Add( mTextLabel ); // Respond to a click anywhere on the window - window.GetRootLayer().TouchSignal().Connect( this, &TiltController::OnTouch ); + window.GetRootLayer().TouchedSignal().Connect( this, &TiltController::OnTouch ); CreateSensor(); diff --git a/examples/visual-transitions/transition-application.cpp b/examples/visual-transitions/transition-application.cpp index 2d1bb62..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 ) ); } diff --git a/examples/web-view/web-view-example.cpp b/examples/web-view/web-view-example.cpp index b50fb42..7d48243 100644 --- a/examples/web-view/web-view-example.cpp +++ b/examples/web-view/web-view-example.cpp @@ -82,7 +82,7 @@ public: mAddressLabel.SetProperty( Toolkit::TextLabel::Property::POINT_SIZE, fontSize ); mAddressLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, Color::WHITE ); mAddressLabel.SetBackgroundColor( Vector4( 0, 0, 0, 0.5f ) ); - mAddressLabel.TouchSignal().Connect( this, &WebViewController::OnTouchText ); + mAddressLabel.TouchedSignal().Connect( this, &WebViewController::OnTouchText ); window.Add( mAddressLabel ); // Respond to key events diff --git a/resources/scripts/animation.json b/resources/scripts/animation.json index bff6d83..b9e1007 100644 --- a/resources/scripts/animation.json +++ b/resources/scripts/animation.json @@ -92,7 +92,7 @@ "size": [200, 200, 1], "orientation": [0, 0, 30], "signals": [{ - "name": "touch", + "name": "touched", "action": "play", "animation": "animate" }] @@ -106,7 +106,7 @@ "position": [-150, -50, 0], "text": "or me", "signals": [{ - "name": "touch", + "name": "touched", "action": "play", "animation": "pathAnimation" }] @@ -124,7 +124,7 @@ "position": [0, 200, 0], "size": [200, 200, 1], "signals": [{ - "name": "touch", + "name": "touched", "action": "play", "animation": "rotate" }], diff --git a/shared/dali-table-view.cpp b/shared/dali-table-view.cpp index 8d10a98..11f0c97 100644 --- a/shared/dali-table-view.cpp +++ b/shared/dali-table-view.cpp @@ -265,7 +265,7 @@ void DaliTableView::Initialize( Application& application ) mScrollView.SetAxisAutoLock( true ); mScrollView.ScrollCompletedSignal().Connect( this, &DaliTableView::OnScrollComplete ); mScrollView.ScrollStartedSignal().Connect( this, &DaliTableView::OnScrollStart ); - mScrollView.TouchSignal().Connect( this, &DaliTableView::OnScrollTouched ); + mScrollView.TouchedSignal().Connect( this, &DaliTableView::OnScrollTouched ); mPageWidth = windowSize.GetWidth() * TABLE_RELATIVE_SIZE.x * 0.5f; @@ -551,7 +551,7 @@ Actor DaliTableView::CreateTile( const std::string& name, const std::string& tit focusableTile.Add( label ); // Connect to the touch events - focusableTile.TouchSignal().Connect( this, &DaliTableView::OnTilePressed ); + focusableTile.TouchedSignal().Connect( this, &DaliTableView::OnTilePressed ); focusableTile.HoveredSignal().Connect( this, &DaliTableView::OnTileHovered ); return focusableTile;