From: Joogab Yun Date: Fri, 28 Aug 2020 02:09:45 +0000 (+0900) Subject: Revert "WheelEvent class pimpling" X-Git-Tag: accepted/tizen/unified/20200831.001930~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;ds=sidebyside;h=508d62d5d491bdccd8e63e34e3ca315abc7f523f;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git Revert "WheelEvent class pimpling" This reverts commit be93fd772a1b1b09425ac0aaec1ea1b64e9a9e60. --- diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h index 7c8ec1a..5deb7a6 100644 --- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h +++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-window.h @@ -33,7 +33,7 @@ class Layer; class RenderSurfaceInterface; struct KeyEvent; class TouchEvent; -class WheelEvent; +struct WheelEvent; typedef Dali::Rect PositionSize; diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp index da5ce83..1ba8d0b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemView.cpp @@ -24,7 +24,7 @@ #include #include #include -#include + using namespace Dali; using namespace Toolkit; @@ -50,7 +50,6 @@ const int RENDER_FRAME_INTERVAL = 16; ///< Duration of each static bool gObjectCreatedCallBackCalled; static bool gOnLayoutActivatedCalled; ///< Whether the LayoutActivated signal was invoked. static bool gOnScrollUpdateCalled; -static bool gOnWheelEventCalled; ///< Whether the WheelEventSignal signal was invoked. static void TestCallback(BaseHandle handle) { @@ -67,12 +66,6 @@ static void OnScrollUpdate( const Vector2& position ) gOnScrollUpdateCalled = true; } -static bool OnWheelEvent( Actor actor, const Dali::WheelEvent& wheelEvent ) -{ - gOnWheelEventCalled = true; - return false; -} - Integration::TouchEvent GenerateSingleTouch( PointState::Type state, const Vector2& screenPosition, uint32_t time ) { Integration::TouchEvent touchEvent; @@ -1330,40 +1323,3 @@ int UtcDaliItemEnableDisableRefresh(void) END_TEST; } - -int UtcDaliItemViewWheelEvent(void) -{ - ToolkitTestApplication application; - Dali::Integration::Scene stage = application.GetScene(); - - // Create the ItemView actor - TestItemFactory factory; - ItemView view = ItemView::New( factory ); - - // Create a grid layout and add it to ItemView - ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID ); - view.AddLayout( *gridLayout ); - stage.Add( view ); - - // Activate the grid layout so that the items will be created and added to ItemView - Vector3 stageSize( stage.GetSize() ); - view.ActivateLayout (0, stageSize, 0.5f ); - - //Connect to wheel event signal - view.WheelEventSignal().Connect( &OnWheelEvent ); - - DALI_TEST_CHECK( !gOnWheelEventCalled ); - - // Render and notify - application.Render(); - application.SendNotification(); - application.Render(); - application.SendNotification(); - - // Perform a wheel event - Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u ); - application.ProcessEvent( wheelEvent ); - DALI_TEST_CHECK( gOnWheelEventCalled ); - - END_TEST; -} diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp index 4e050f3..4e3974d 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollView.cpp @@ -20,7 +20,6 @@ #include #include #include -#include using namespace Dali; using namespace Toolkit; @@ -114,7 +113,6 @@ static bool gOnScrollStartCalled; ///< Whether the OnScrol static bool gOnScrollUpdateCalled; ///< Whether the OnScrollUpdate signal was invoked. static bool gOnScrollCompleteCalled; ///< Whether the OnScrollComplete signal was invoked. static bool gOnSnapStartCalled; ///< Whether the OnSnapStart signal was invoked. -static bool gOnWheelEventCalled; ///< Whether the WheelEventSignal signal was invoked. static SnapType gLastSnapType; ///< Snaping information from SnapEvent. static Vector3 gConstraintResult; ///< Result from constraint. @@ -160,19 +158,6 @@ static void OnSnapStart( const ScrollView::SnapEvent& event ) } /** - * Invoked after a wheel-event is received - * - * @param[in] actor The owing actor - * @param[in] event The wheel event - * @return True if the event should be consumed - */ -static bool OnWheelEvent( Actor actor, const Dali::WheelEvent& wheelEvent ) -{ - gOnWheelEventCalled = true; - return false; -} - -/** * TestSumConstraint * * Summation of current value, property, and offset. @@ -3008,81 +2993,3 @@ int UtcDaliScrollViewSetGetProperty(void) END_TEST; } - -int UtcDaliToolkitScrollViewWheelEvent(void) -{ - ToolkitTestApplication application; - - // Set up a scrollView. - ScrollView scrollView = ScrollView::New(); - - // Do not rely on stage size for UTC tests. - Vector2 viewPageSize( 720.0f, 1280.0f ); - scrollView.SetResizePolicy( ResizePolicy::FIXED, Dimension::ALL_DIMENSIONS ); - scrollView.SetProperty( Actor::Property::SIZE, viewPageSize ); - scrollView.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER ); - scrollView.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::CENTER ); - scrollView.SetProperty( Actor::Property::POSITION, Vector3( 0.0f, 0.0f, 0.0f )); - - // Position rulers. - // We set the X ruler to fixed to give us pages to snap to. - Dali::Toolkit::FixedRuler* rulerX = new Dali::Toolkit::FixedRuler( viewPageSize.width ); - // Note: The 3x page width is arbitary, but we need enough to show that we are - // capping page movement by the page limiter, and not the domain. - rulerX->SetDomain( Dali::Toolkit::RulerDomain( 0.0f, viewPageSize.width * 3.0f, false ) ); - Dali::Toolkit::RulerPtr rulerY = new Dali::Toolkit::DefaultRuler(); - rulerY->Disable(); - scrollView.SetRulerX( rulerX ); - scrollView.SetRulerY( rulerY ); - - scrollView.SetWrapMode( false ); - - application.GetScene().Add( scrollView ); - - //Connect to wheel event signal - scrollView.WheelEventSignal().Connect( &OnWheelEvent ); - - DALI_TEST_CHECK( !gOnWheelEventCalled ); - - // Render and notify - application.Render(); - application.SendNotification(); - application.Render(); - application.SendNotification(); - - // Perform a wheel event - Dali::Integration::WheelEvent wheelEvent( Dali::Integration::WheelEvent::MOUSE_WHEEL, 0, 0u, Vector2( 10.0f, 10.0f ), 1, 1000u ); - application.ProcessEvent( wheelEvent ); - DALI_TEST_CHECK( gOnWheelEventCalled ); - - // Set X ruler to free - Dali::Toolkit::DefaultRuler* defaultRuler = new Dali::Toolkit::DefaultRuler(); - scrollView.SetRulerX( defaultRuler ); - - // Perform a wheel event - gOnWheelEventCalled = false; - application.ProcessEvent( wheelEvent ); - DALI_TEST_CHECK( gOnWheelEventCalled ); - - // Enable Y ruler - rulerY->Enable(); - - // Perform a wheel event - gOnWheelEventCalled = false; - application.ProcessEvent( wheelEvent ); - DALI_TEST_CHECK( gOnWheelEventCalled ); - - // Wait until it finishes scrolling - Wait(application, RENDER_DELAY_SCROLL); - - // Set Y ruler to fixed - Dali::Toolkit::FixedRuler* fixedRulerY = new Dali::Toolkit::FixedRuler( viewPageSize.height ); - scrollView.SetRulerY( fixedRulerY ); - - // Perform a wheel event - gOnWheelEventCalled = false; - application.ProcessEvent( wheelEvent ); - DALI_TEST_CHECK( gOnWheelEventCalled ); - - END_TEST; -} diff --git a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp index 5ed9b79..8f1e7c0 100755 --- a/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.cpp @@ -1029,7 +1029,7 @@ bool ItemView::OnWheelEvent(const WheelEvent& event) { Actor self = Self(); const Vector3 layoutSize = Self().GetCurrentProperty< Vector3 >( Actor::Property::SIZE ); - float layoutPositionDelta = GetCurrentLayoutPosition(0) - (event.GetDelta() * mWheelScrollDistanceStep * mActiveLayout->GetScrollSpeedFactor()); + float layoutPositionDelta = GetCurrentLayoutPosition(0) - (event.z * mWheelScrollDistanceStep * mActiveLayout->GetScrollSpeedFactor()); float firstItemScrollPosition = ClampFirstItemPosition(layoutPositionDelta, layoutSize, *mActiveLayout); self.SetProperty(Toolkit::ItemView::Property::LAYOUT_POSITION, firstItemScrollPosition ); diff --git a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp index 8375e54..17b3acb 100755 --- a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp +++ b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp @@ -2144,14 +2144,14 @@ bool ScrollView::OnWheelEvent(const WheelEvent& event) if(mRulerX->GetType() == Ruler::Free) { // Free panning mode - targetScrollPosition.x += event.GetDelta() * mWheelScrollDistanceStep.x; + targetScrollPosition.x += event.z * mWheelScrollDistanceStep.x; ClampPosition(targetScrollPosition); ScrollTo(-targetScrollPosition); } else if(!mScrolling) { // Snap mode, only respond to the event when the previous snap animation is finished. - ScrollTo(GetCurrentPage() - event.GetDelta()); + ScrollTo(GetCurrentPage() - event.z); } } else @@ -2160,14 +2160,14 @@ bool ScrollView::OnWheelEvent(const WheelEvent& event) if(mRulerY->GetType() == Ruler::Free) { // Free panning mode - targetScrollPosition.y += event.GetDelta() * mWheelScrollDistanceStep.y; + targetScrollPosition.y += event.z * mWheelScrollDistanceStep.y; ClampPosition(targetScrollPosition); ScrollTo(-targetScrollPosition); } else if(!mScrolling) { // Snap mode, only respond to the event when the previous snap animation is finished. - ScrollTo(GetCurrentPage() - event.GetDelta() * mRulerX->GetTotalPages()); + ScrollTo(GetCurrentPage() - event.z * mRulerX->GetTotalPages()); } }