From f5b6b7544cef5768f4ec8bff6c6642f80d781817 Mon Sep 17 00:00:00 2001 From: Joogab Yun Date: Wed, 19 Aug 2020 14:21:48 +0900 Subject: [PATCH] [Tizen] Revert "Use touch consumed return to set whether we process a gesture or not" This reverts commit a9439d4db292506144c70a11092f5d5cc20b96bd. Change-Id: I0d049d61376bc2b9fe1caa058e2c2a6bc38f8c91 --- .../dali-test-suite-utils/test-touch-data-utils.h | 44 --------- .../src/dali/utc-Dali-LongPressGestureDetector.cpp | 93 ------------------- .../src/dali/utc-Dali-PanGestureDetector.cpp | 93 ------------------- .../src/dali/utc-Dali-PinchGestureDetector.cpp | 102 --------------------- .../src/dali/utc-Dali-RotationGestureDetector.cpp | 101 -------------------- .../src/dali/utc-Dali-TapGestureDetector.cpp | 83 ----------------- dali/internal/event/events/event-processor.cpp | 16 +--- .../pinch-gesture/pinch-gesture-recognizer.cpp | 14 +-- .../rotation-gesture-recognizer.cpp | 14 +-- .../event/events/touch-event-processor.cpp | 11 +-- dali/internal/event/events/touch-event-processor.h | 3 +- dali/public-api/actors/actor.h | 6 +- 12 files changed, 17 insertions(+), 563 deletions(-) delete mode 100644 automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h diff --git a/automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h b/automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h deleted file mode 100644 index a259179..0000000 --- a/automated-tests/src/dali/dali-test-suite-utils/test-touch-data-utils.h +++ /dev/null @@ -1,44 +0,0 @@ -#ifndef TEST_TOUCH_DATA_UTILS_H -#define TEST_TOUCH_DATA_UTILS_H - -/* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - * - */ - -#include - -/** - * Functor to be connected to an Actor's TouchSignal. - * Allows the user to specify whether the functor should return true (consumed) or false. - */ -struct TouchDataFunctorConsumeSetter -{ - TouchDataFunctorConsumeSetter( bool& consume ) - : mConsume( consume ) - { - } - - bool operator()(Dali::Actor actor, const Dali::TouchData& touch) - { - return mConsume; - } - -private: - bool& mConsume; -}; - -#endif // TEST_TOUCH_DATA_UTILS_H - diff --git a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp index 1053762..e0f68d5 100644 --- a/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-LongPressGestureDetector.cpp @@ -25,7 +25,6 @@ #include #include #include -#include using namespace Dali; @@ -997,95 +996,3 @@ int UtcDaliLongPressGestureSetMinimumHoldingTime(void) END_TEST; } - -int UtcDaliLongPressGestureInterruptedWhenTouchConsumed(void) -{ - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); - actor.TouchSignal().Connect(&application,touchFunctor); - - // Render and notify - application.SendNotification(); - application.Render(); - - SignalData data; - GestureReceivedFunctor functor(data); - - LongPressGestureDetector detector = LongPressGestureDetector::New(); - detector.Attach(actor); - detector.DetectedSignal().Connect(&application, functor); - - // Start gesture within the actor's area, we should receive the gesture as the touch is NOT being consumed - TestGenerateLongPress( application, 50.0f, 50.0f ); - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - data.Reset(); - TestEndLongPress(application, 50.0f,50.0f); - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - data.Reset(); - - // Another gesture in the same location, this time we will not receive it as touch is being consumed - consume = true; - TestGenerateLongPress( application, 50.0f, 50.0f ); - DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); - data.Reset(); - TestEndLongPress(application, 50.0f,50.0f); - DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); - - END_TEST; -} - -int UtcDaliLongPressGestureDisableDetectionDuringLongPressN(void) -{ - // Crash occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached - - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - // Add a detector - LongPressGestureDetector detector = LongPressGestureDetector::New(); - bool functorCalled = false; - detector.Attach( actor ); - detector.DetectedSignal().Connect( - &application, - [&detector, &functorCalled](Actor actor, const LongPressGesture& gesture) - { - if( gesture.state == Gesture::Finished ) - { - detector.Detach(actor); - functorCalled = true; - } - }); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Try the gesture, should not crash - try - { - TestGenerateLongPress( application, 50.0f, 10.0f ); - TestEndLongPress( application, 50.0f, 10.0f ); - - DALI_TEST_CHECK( true ); // No crash, test has passed - DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION); - } - catch(...) - { - DALI_TEST_CHECK( false ); // If we crash, the test has failed - } - - END_TEST; -} - - diff --git a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp index f615f80..b4c66d4 100644 --- a/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PanGestureDetector.cpp @@ -26,7 +26,6 @@ #include #include #include -#include using namespace Dali; @@ -2846,95 +2845,3 @@ int UtcDaliPanGestureNoTimeDiff(void) END_TEST; } - -int UtcDaliPanGestureInterruptedWhenTouchConsumed(void) -{ - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); - actor.TouchSignal().Connect(&application,touchFunctor); - - // Render and notify - application.SendNotification(); - application.Render(); - - SignalData data; - GestureReceivedFunctor functor(data); - - PanGestureDetector detector = PanGestureDetector::New(); - detector.Attach(actor); - detector.DetectedSignal().Connect(&application, functor); - - // Start gesture within the actor's area, we should receive the pan as the touch is NOT being consumed - uint32_t time = 100; - TestStartPan( application, Vector2( 10.0f, 20.0f ), Vector2( 26.0f, 20.0f ), time ); - - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION); - data.Reset(); - - // Continue the gesture within the actor's area, but now the touch consumes thus cancelling the gesture - consume = true; - - TestMovePan( application, Vector2(26.0f, 4.0f), time ); - time += TestGetFrameInterval(); - - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION); - - END_TEST; -} - -int UtcDaliPanGestureDisableDetectionDuringPanN(void) -{ - // Crash occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached - - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - // Add a pan detector - PanGestureDetector detector = PanGestureDetector::New(); - bool functorCalled = false; - detector.Attach( actor ); - detector.DetectedSignal().Connect( - &application, - [&detector, &functorCalled](Actor actor, const PanGesture& pan) - { - if( pan.state == Gesture::Finished ) - { - detector.Detach(actor); - functorCalled = true; - } - }); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Try the gesture, should not crash - try - { - uint32_t time = 100; - TestStartPan( application, Vector2( 10.0f, 20.0f ), Vector2( 26.0f, 20.0f ), time ); - TestEndPan( application, Vector2(26.0f, 20.0f) ); - - DALI_TEST_CHECK( true ); // No crash, test has passed - DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION); - } - catch(...) - { - DALI_TEST_CHECK( false ); // If we crash, the test has failed - } - - END_TEST; -} diff --git a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp index c8f30b2..0c271c7 100644 --- a/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-PinchGestureDetector.cpp @@ -23,7 +23,6 @@ #include #include #include -#include using namespace Dali; @@ -1115,104 +1114,3 @@ int UtcDaliPinchGestureLayerConsumesTouch(void) END_TEST; } - -int UtcDaliPinchGestureInterruptedWhenTouchConsumed(void) -{ - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); - actor.TouchSignal().Connect(&application,touchFunctor); - - // Render and notify - application.SendNotification(); - application.Render(); - - SignalData data; - GestureReceivedFunctor functor(data); - - PinchGestureDetector detector = PinchGestureDetector::New(); - detector.Attach(actor); - detector.DetectedSignal().Connect(&application, functor); - - // Start gesture within the actor's area, we should receive the pinch as the touch is NOT being consumed - TestStartPinch( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION); - data.Reset(); - - // Continue the gesture within the actor's area, but now the touch consumes thus cancelling the gesture - consume = true; - - TestContinuePinch( application, Vector2( 112.0f, 100.0f ), Vector2( 112.0f, 124.0f ), - Vector2( 5.0f, 5.0f ), Vector2( 35.0f, 35.0f ), 200 ); - - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION); - data.Reset(); - - // Start another pinch, we should not even get the callback this time - TestStartPinch( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); - - END_TEST; -} - -int UtcDaliPinchGestureDisableDetectionDuringPinchN(void) -{ - // Crash sometimes occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached - - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - // Add a detector - PinchGestureDetector detector = PinchGestureDetector::New(); - bool functorCalled = false; - detector.Attach( actor ); - detector.DetectedSignal().Connect( - &application, - [&detector, &functorCalled](Actor actor, const PinchGesture& gesture) - { - if( gesture.state == Gesture::Finished ) - { - detector.Detach(actor); - functorCalled = true; - } - }); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Try the gesture, should not crash - try - { - TestStartPinch( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - TestContinuePinch( application, Vector2( 112.0f, 100.0f ), Vector2( 112.0f, 124.0f ), - Vector2( 5.0f, 5.0f ), Vector2( 35.0f, 35.0f ), 200 ); - TestEndPinch( application, Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), - Vector2( 19.0f, 20.0f ), Vector2( 21.0f, 20.0f ), 1000); - - DALI_TEST_CHECK( true ); // No crash, test has passed - DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION); - } - catch(...) - { - DALI_TEST_CHECK( false ); // If we crash, the test has failed - } - - END_TEST; -} diff --git a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp index 0219e84..cfe42b0 100644 --- a/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-RotationGestureDetector.cpp @@ -26,7 +26,6 @@ #include #include #include -#include using namespace Dali; @@ -1106,103 +1105,3 @@ int UtcDaliRotationGestureLayerConsumesTouch(void) END_TEST; } -int UtcDaliRotationGestureInterruptedWhenTouchConsumed(void) -{ - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); - actor.TouchSignal().Connect(&application,touchFunctor); - - // Render and notify - application.SendNotification(); - application.Render(); - - SignalData data; - GestureReceivedFunctor functor(data); - - RotationGestureDetector detector = RotationGestureDetector::New(); - detector.Attach(actor); - detector.DetectedSignal().Connect(&application, functor); - - // Start gesture within the actor's area, we should receive the rotation as the touch is NOT being consumed - TestStartRotation( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Started, data.receivedGesture.state, TEST_LOCATION); - data.Reset(); - - // Continue the gesture within the actor's area, but now the touch consumes thus cancelling the gesture - consume = true; - - TestContinueRotation( application, Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), - Vector2( 15.0f, 20.0f ), Vector2( 25.0f, 20.0f ), 500 ); - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - DALI_TEST_EQUALS(Gesture::Cancelled, data.receivedGesture.state, TEST_LOCATION); - data.Reset(); - - // Start another rotation, we should not even get the callback this time - TestStartRotation( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); - - END_TEST; -} - -int UtcDaliRotationGestureDisableDetectionDuringRotationN(void) -{ - // Crash sometimes occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached - - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - // Add a detector - RotationGestureDetector detector = RotationGestureDetector::New(); - bool functorCalled = false; - detector.Attach( actor ); - detector.DetectedSignal().Connect( - &application, - [&detector, &functorCalled](Actor actor, const RotationGesture& gesture) - { - if( gesture.state == Gesture::Finished ) - { - detector.Detach(actor); - functorCalled = true; - } - }); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Try the gesture, should not crash - try - { - TestStartRotation( application, Vector2( 2.0f, 20.0f ), Vector2( 38.0f, 20.0f ), - Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), 100 ); - TestContinueRotation( application, Vector2( 112.0f, 100.0f ), Vector2( 112.0f, 124.0f ), - Vector2( 5.0f, 5.0f ), Vector2( 35.0f, 35.0f ), 200 ); - TestEndRotation( application, Vector2( 10.0f, 20.0f ), Vector2( 30.0f, 20.0f ), - Vector2( 19.0f, 20.0f ), Vector2( 21.0f, 20.0f ), 1000); - - DALI_TEST_CHECK( true ); // No crash, test has passed - DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION); - } - catch(...) - { - DALI_TEST_CHECK( false ); // If we crash, the test has failed - } - - END_TEST; -} - diff --git a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp index cf86531..30966d4 100644 --- a/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp +++ b/automated-tests/src/dali/utc-Dali-TapGestureDetector.cpp @@ -23,7 +23,6 @@ #include #include #include -#include using namespace Dali; @@ -914,85 +913,3 @@ int UtcDaliTapGestureLayerConsumesTouch(void) END_TEST; } - -int UtcDaliTapGestureInterruptedWhenTouchConsumed(void) -{ - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - bool consume = false; - TouchDataFunctorConsumeSetter touchFunctor(consume); - actor.TouchSignal().Connect(&application,touchFunctor); - - // Render and notify - application.SendNotification(); - application.Render(); - - SignalData data; - GestureReceivedFunctor functor(data); - - TapGestureDetector detector = TapGestureDetector::New(); - detector.Attach(actor); - detector.DetectedSignal().Connect(&application, functor); - - // Start gesture within the actor's area, we should receive the gesture as the touch is NOT being consumed - TestGenerateTap( application, 50.0f, 50.0f ); - DALI_TEST_EQUALS(true, data.functorCalled, TEST_LOCATION); - data.Reset(); - - // Another gesture in the same location, this time we will not receive it as touch is being consumed - consume = true; - TestGenerateTap( application, 50.0f, 50.0f ); - DALI_TEST_EQUALS(false, data.functorCalled, TEST_LOCATION); - data.Reset(); - - END_TEST; -} - -int UtcDaliTapGestureDisableDetectionDuringTapN(void) -{ - // Crash sometimes occurred when gesture-recognizer was deleted internally during a signal when the attached actor was detached - - TestApplication application; - - Actor actor = Actor::New(); - actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); - actor.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); - application.GetScene().Add(actor); - - // Add a detector - TapGestureDetector detector = TapGestureDetector::New(); - bool functorCalled = false; - detector.Attach( actor ); - detector.DetectedSignal().Connect( - &application, - [&detector, &functorCalled](Actor actor, const TapGesture& gesture) - { - detector.Detach(actor); - functorCalled = true; - }); - - // Render and notify - application.SendNotification(); - application.Render(); - - // Try the gesture, should not crash - try - { - TestGenerateTap( application, 50.0f, 10.0f ); - - DALI_TEST_CHECK( true ); // No crash, test has passed - DALI_TEST_EQUALS(functorCalled, true, TEST_LOCATION); - } - catch(...) - { - DALI_TEST_CHECK( false ); // If we crash, the test has failed - } - - END_TEST; -} - diff --git a/dali/internal/event/events/event-processor.cpp b/dali/internal/event/events/event-processor.cpp index fed209a..06250ba 100644 --- a/dali/internal/event/events/event-processor.cpp +++ b/dali/internal/event/events/event-processor.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -152,18 +152,8 @@ void EventProcessor::ProcessEvents() { case Event::Touch: { - Integration::TouchEvent& touchEvent = static_cast(*event); - const bool consumed = mTouchEventProcessor.ProcessTouchEvent( touchEvent ); - - // If touch is consumed, then gestures should be cancelled - // Do this by sending an interrupted event to the GestureEventProcessor - if( consumed ) - { - Integration::Point& point = touchEvent.GetPoint(0); - point.SetState( PointState::INTERRUPTED ); - } - - mGestureEventProcessor.ProcessTouchEvent(mScene, touchEvent); + mTouchEventProcessor.ProcessTouchEvent( static_cast(*event) ); + mGestureEventProcessor.ProcessTouchEvent(mScene, static_cast(*event)); break; } diff --git a/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp index de2bd4f..0c41120 100644 --- a/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp +++ b/dali/internal/event/events/pinch-gesture/pinch-gesture-recognizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -118,7 +118,7 @@ void PinchGestureRecognizer::SendEvent(const Integration::TouchEvent& event) const Integration::Point& currentPoint1 = event.points[0]; const Integration::Point& currentPoint2 = event.points[1]; - if (currentPoint1.GetState() == PointState::UP || currentPoint2.GetState() == PointState::UP || currentPoint1.GetState() == PointState::INTERRUPTED) + if (currentPoint1.GetState() == PointState::UP || currentPoint2.GetState() == PointState::UP) { // One of our touch points has an Up event so change our state back to Clear. mState = Clear; @@ -171,15 +171,7 @@ void PinchGestureRecognizer::SendEvent(const Integration::TouchEvent& event) case Started: { - if(event.points[0].GetState() == PointState::INTERRUPTED) - { - // System interruption occurred, pinch should be cancelled - mTouchEvents.clear(); - SendPinch(Gesture::Cancelled, event); - mState = Clear; - mTouchEvents.clear(); - } - else if (pointCount != 2) + if (pointCount != 2) { // Send pinch finished event SendPinch(Gesture::Finished, event); diff --git a/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.cpp b/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.cpp index 6de3490..7863886 100644 --- a/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.cpp +++ b/dali/internal/event/events/rotation-gesture/rotation-gesture-recognizer.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -97,7 +97,7 @@ void RotationGestureRecognizer::SendEvent( const Integration::TouchEvent& event const Integration::Point& currentPoint1 = event.points[0]; const Integration::Point& currentPoint2 = event.points[1]; - if( currentPoint1.GetState() == PointState::UP || currentPoint2.GetState() == PointState::UP || currentPoint1.GetState() == PointState::INTERRUPTED ) + if( currentPoint1.GetState() == PointState::UP || currentPoint2.GetState() == PointState::UP ) { // One of our touch points has an Up event so change our state back to Clear. mState = Clear; @@ -139,15 +139,7 @@ void RotationGestureRecognizer::SendEvent( const Integration::TouchEvent& event case Started: { - if(event.points[0].GetState() == PointState::INTERRUPTED) - { - // System interruption occurred, rotation should be cancelled - mTouchEvents.clear(); - SendRotation(Gesture::Cancelled, event); - mState = Clear; - mTouchEvents.clear(); - } - else if( pointCount != 2 ) + if( pointCount != 2 ) { // Send rotation finished event SendRotation( Gesture::Finished, event ); diff --git a/dali/internal/event/events/touch-event-processor.cpp b/dali/internal/event/events/touch-event-processor.cpp index 1d63633..8974433 100644 --- a/dali/internal/event/events/touch-event-processor.cpp +++ b/dali/internal/event/events/touch-event-processor.cpp @@ -207,7 +207,7 @@ TouchEventProcessor::~TouchEventProcessor() DALI_LOG_TRACE_METHOD( gLogFilter ); } -bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& event ) +void TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& event ) { DALI_LOG_TRACE_METHOD( gLogFilter ); DALI_ASSERT_ALWAYS( !event.points.empty() && "Empty TouchEvent sent from Integration\n" ); @@ -271,7 +271,7 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even touchData->AddPoint( currentPoint ); mScene.EmitTouchedSignal( touchEvent, touchDataHandle ); - return false; // No need for hit testing & already an interrupted event so just return false + return; // No need for hit testing } // 2) Hit Testing. @@ -318,14 +318,11 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even // 3) Recursively deliver events to the actor and its parents, until the event is consumed or the stage is reached. - bool consumed = false; - // Emit the touch signal Dali::Actor consumedActor; if ( currentRenderTask ) { consumedActor = EmitTouchSignals( touchData->GetPoint( 0 ).GetHitActor(), touchEvent, touchDataHandle ); - consumed = consumedActor ? true : false; } Integration::Point& primaryPoint = touchData->GetPoint( 0 ); @@ -375,8 +372,6 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even } } - consumed |= leaveEventConsumer ? true : false; - // Check if the motion event has been consumed by another actor's listener. In this case, the previously // consumed actor's listeners may need to be informed (through a leave event). // Further checks here to ensure we do not signal the same actor twice for the same event. @@ -488,8 +483,6 @@ bool TouchEventProcessor::ProcessTouchEvent( const Integration::TouchEvent& even } } } - - return consumed; } void TouchEventProcessor::OnObservedActorDisconnected( Actor* actor ) diff --git a/dali/internal/event/events/touch-event-processor.h b/dali/internal/event/events/touch-event-processor.h index c2e4bc7..9306e6f 100644 --- a/dali/internal/event/events/touch-event-processor.h +++ b/dali/internal/event/events/touch-event-processor.h @@ -67,9 +67,8 @@ public: /** * This function is called by the event processor whenever a touch event occurs. * @param[in] event The touch event that has occurred. - * @return true if consumed */ - bool ProcessTouchEvent( const Integration::TouchEvent& event ); + void ProcessTouchEvent( const Integration::TouchEvent& event ); private: diff --git a/dali/public-api/actors/actor.h b/dali/public-api/actors/actor.h index 2f12cdf..16b6fcd 100644 --- a/dali/public-api/actors/actor.h +++ b/dali/public-api/actors/actor.h @@ -49,6 +49,7 @@ class Renderer; struct Degree; class Quaternion; class Layer; +struct KeyEvent; class TouchData; struct TouchEvent; struct HoverEvent; @@ -216,6 +217,10 @@ typedef Rect Padding; ///< Padding definition @SINCE_1_0.0 * - If the consumed actor on hover-start is not the same as the consumed actor on hover-finished, then * hover signals are also emitted from the hover-started actor with an "Interrupted" state. * + *

Key Events:

+ * + * Key events are received by an actor once set to grab key events, only one actor can be set as focused. + * * @nosubgrouping * * Signals @@ -1187,7 +1192,6 @@ public: // Signals * @endcode * The return value of True, indicates that the touch event has been consumed. * Otherwise the signal will be emitted on the next sensitive parent of the actor. - * A true return will also cancel any ongoing gestures. * @SINCE_1_1.37 * @return The signal to connect to * @pre The Actor has been initialized. -- 2.7.4