/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * 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.
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/events/pan-gesture-event.h>
-#include <dali-toolkit/devel-api/controls/scrollable/item-view/default-item-layout-property.h>
-#include <dali-toolkit/devel-api/controls/scrollable/item-view/item-view-devel.h>
-
+#include <dali/integration-api/events/wheel-event-integ.h>
using namespace Dali;
using namespace Toolkit;
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)
{
gOnScrollUpdateCalled = true;
}
-// Generate a PanGestureEvent to send to Core
-Integration::PanGestureEvent GeneratePan(
- Gesture::State state,
- const Vector2& previousPosition,
- const Vector2& currentPosition,
- unsigned long timeDelta,
- unsigned int numberOfTouches = 1)
+static bool OnWheelEvent( Actor actor, const Dali::WheelEvent& wheelEvent )
{
- Integration::PanGestureEvent pan(state);
-
- pan.previousPosition = previousPosition;
- pan.currentPosition = currentPosition;
- pan.timeDelta = timeDelta;
- pan.numberOfTouches = numberOfTouches;
-
- return pan;
+ gOnWheelEventCalled = true;
+ return false;
}
-/**
- * Helper to generate PanGestureEvent
- *
- * @param[in] application Application instance
- * @param[in] state The Gesture State
- * @param[in] pos The current position of touch.
- */
-static void SendPan(ToolkitTestApplication& application, Gesture::State state, const Vector2& pos)
+Integration::TouchEvent GenerateSingleTouch( PointState::Type state, const Vector2& screenPosition, uint32_t time )
{
- static Vector2 last;
-
- if( (state == Gesture::Started) ||
- (state == Gesture::Possible) )
- {
- last.x = pos.x;
- last.y = pos.y;
- }
-
- application.ProcessEvent(GeneratePan(state, last, pos, RENDER_FRAME_INTERVAL));
-
- last.x = pos.x;
- last.y = pos.y;
+ Integration::TouchEvent touchEvent;
+ Integration::Point point;
+ point.SetState( state );
+ point.SetDeviceId(4);
+ point.SetScreenPosition( screenPosition );
+ point.SetDeviceClass( Device::Class::TOUCH );
+ point.SetDeviceSubclass( Device::Subclass::NONE );
+ touchEvent.points.push_back( point );
+ touchEvent.time = time;
+ return touchEvent;
}
/*
virtual Actor NewItem(unsigned int itemId)
{
// Create a renderable actor for this item
- Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME );
- Actor actor = CreateRenderableActor(image);
-
- return actor;
+ return ImageView::New( TEST_IMAGE_FILE_NAME );
}
};
DALI_TEST_CHECK(view);
//Additional check to ensure object is created by checking if it's registered
- ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
+ ObjectRegistry registry = application.GetCore().GetObjectRegistry();
DALI_TEST_CHECK( registry );
gObjectCreatedCallBackCalled = false;
END_TEST;
}
+int UtcDaliItemViewCopyConstructor(void)
+{
+ ToolkitTestApplication application;
+
+ TestItemFactory factory;
+ ItemView itemView = ItemView::New( factory );
+ DALI_TEST_CHECK( itemView );
+
+ ItemView copy( itemView );
+ DALI_TEST_CHECK( copy );
+
+ END_TEST;
+}
+
+int UtcDaliItemViewCopyAssignment(void)
+{
+ ToolkitTestApplication application;
+
+ TestItemFactory factory;
+ ItemView itemView = ItemView::New( factory );
+ DALI_TEST_CHECK( itemView );
+
+ ItemView copy;
+ copy = itemView;
+ DALI_TEST_CHECK( copy );
+ DALI_TEST_EQUALS( itemView, copy, TEST_LOCATION );
+
+ END_TEST;
+}
+
+int UtcDaliItemViewMoveConstructor(void)
+{
+ ToolkitTestApplication application;
+
+ TestItemFactory factory;
+ ItemView itemView = ItemView::New( factory );
+ DALI_TEST_EQUALS( 1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ itemView.SetProperty( Actor::Property::SENSITIVE, false );
+ DALI_TEST_CHECK( false == itemView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+
+ ItemView moved = std::move( itemView );
+ DALI_TEST_CHECK( moved );
+ DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+ DALI_TEST_CHECK( !itemView );
+
+ END_TEST;
+}
+
+int UtcDaliItemViewMoveAssignment(void)
+{
+ ToolkitTestApplication application;
+
+ TestItemFactory factory;
+ ItemView itemView = ItemView::New( factory );
+ DALI_TEST_EQUALS( 1, itemView.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ itemView.SetProperty( Actor::Property::SENSITIVE, false );
+ DALI_TEST_CHECK( false == itemView.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+
+ ItemView moved;
+ moved = std::move( itemView );
+ DALI_TEST_CHECK( moved );
+ DALI_TEST_EQUALS( 1, moved.GetBaseObject().ReferenceCount(), TEST_LOCATION );
+ DALI_TEST_CHECK( false == moved.GetProperty< bool >( Actor::Property::SENSITIVE ) );
+ DALI_TEST_CHECK( !itemView );
+
+ END_TEST;
+}
+
int UtcDaliItemViewDownCast(void)
{
ToolkitTestApplication application;
DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
// Activate the depth layout
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(1, stageSize, 0.5f);
// Check the current active layout is the depth layout
DALI_TEST_CHECK(view.GetActiveLayout() == NULL);
// Activate the grid layout
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
// Check the current active layout is the grid layout
view.AddLayout(*gridLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
// Get the item given the item ID
view.AddLayout(*gridLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
// Get the item given the item ID 2 and 3
view.AddLayout(*depthLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.0f);
// Check the current layout position for the 10th items is 9.0f
Vector3 vec(480.0f, 800.0f, 0.0f);
ItemLayoutPtr layout = DefaultItemLayout::New( DefaultItemLayout::DEPTH );
- view.SetName("view actor");
+ view.SetProperty( Dali::Actor::Property::NAME,"view actor");
view.AddLayout(*layout);
- view.SetSize(vec);
+ view.SetProperty( Actor::Property::SIZE, vec );
- Stage::GetCurrent().Add(view);
+ application.GetScene().Add(view);
layout->SetOrientation(ControlOrientation::Down);
view.ActivateLayout(0, vec, 0.0f);
tet_result(TET_FAIL);
}
- Stage::GetCurrent().Remove(view);
+ application.GetScene().Remove(view);
END_TEST;
}
view.AddLayout(*gridLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.0f);
// Get the specified item where new item to be inserted before that
view.AddLayout(*depthLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
unsigned int itemCount = view.GetChildCount();
{
Actor child = view.GetChildAt( i );
Actor newActor = Actor::New();
- newActor.SetName("Inserted");
+ newActor.SetProperty( Dali::Actor::Property::NAME,"Inserted");
insertList.push_back( Item( view.GetItemId(child), newActor ) );
}
{
Actor child = view.GetChildAt( i );
- if( child.GetName() == "Inserted" )
+ if( child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Inserted" )
{
removeList.push_back( view.GetItemId(child) );
}
view.AddLayout(*spiralLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
Actor newActor = Actor::New();
view.AddLayout(*spiralLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
ItemContainer replaceList;
{
Actor child = view.GetItem( i );
Actor newActor = Actor::New();
- newActor.SetName("Replaced");
+ newActor.SetProperty( Dali::Actor::Property::NAME,"Replaced");
replaceList.push_back( Item( i, newActor ) );
}
view.ReplaceItems( replaceList, 0.5f );
}
- DALI_TEST_CHECK(view.GetItem(0).GetName() == "Replaced");
- DALI_TEST_CHECK(view.GetItem(8).GetName() == "Replaced");
+ DALI_TEST_CHECK(view.GetItem(0).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced");
+ DALI_TEST_CHECK(view.GetItem(8).GetProperty< std::string >( Dali::Actor::Property::NAME ) == "Replaced");
END_TEST;
}
view.AddLayout(*spiralLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
ItemRange itemRange(0, 0);
view.AddLayout(*spiralLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
Vector3 anchorPoint(10.0f, 10.0f, 0.0f);
view.SetItemsAnchorPoint(anchorPoint);
DALI_TEST_CHECK(view.GetItemsAnchorPoint() == anchorPoint);
- DALI_TEST_CHECK(view.GetItem(0).GetCurrentAnchorPoint() == anchorPoint);
+ DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::ANCHOR_POINT ) == anchorPoint);
END_TEST;
}
view.AddLayout(*gridLayout);
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.5f);
Vector3 parentOrigin(10.0f, 10.0f, 0.0f);
view.SetItemsParentOrigin(parentOrigin);
DALI_TEST_CHECK(view.GetItemsParentOrigin() == parentOrigin);
- DALI_TEST_CHECK(view.GetItem(0).GetCurrentParentOrigin() == parentOrigin);
+ DALI_TEST_CHECK(view.GetItem(0).GetCurrentProperty< Vector3 >( Actor::Property::PARENT_ORIGIN ) == parentOrigin);
END_TEST;
}
ItemLayoutPtr gridLayout = DefaultItemLayout::New( DefaultItemLayout::GRID );
view.AddLayout(*gridLayout);
- Stage::GetCurrent().Add( view );
+ application.GetScene().Add( view );
// Connect the layout activated signal
view.LayoutActivatedSignal().Connect( &OnLayoutActivated );
application.Render();
// Activate the grid layout so that the items will be created and added to ItemView
- Vector3 stageSize(Dali::Stage::GetCurrent().GetSize());
+ Vector3 stageSize(application.GetScene().GetSize());
view.ActivateLayout(0, stageSize, 0.1f);
// Wait for 0.1 second
DALI_TEST_EQUALS( view.GetProperty(ItemView::Property::REFRESH_INTERVAL).Get<float>(), 11.0f, TEST_LOCATION );
// Test "layout" property
- DALI_TEST_CHECK( view.GetPropertyIndex("layout") == DevelItemView::Property::LAYOUT );
+ DALI_TEST_CHECK( view.GetPropertyIndex("layout") == ItemView::Property::LAYOUT );
Property::Map gridLayoutProperty;
gridLayoutProperty.Insert( DefaultItemLayoutProperty::TYPE, Dali::Property::Value((int)DefaultItemLayout::GRID) );
gridLayoutProperty.Insert( DefaultItemLayoutProperty::ITEM_SIZE, Dali::Property::Value(Vector3(200, 200,50)) );
layoutArray.PushBack(spiralLayoutPrperty);
layoutArray.PushBack(listLayoutPrperty);
- view.SetProperty( DevelItemView::Property::LAYOUT, layoutArray);
+ view.SetProperty( ItemView::Property::LAYOUT, layoutArray);
Property::Array getLayoutArray;
- DALI_TEST_CHECK( view.GetProperty(DevelItemView::Property::LAYOUT ).Get( getLayoutArray ) );
+ DALI_TEST_CHECK( view.GetProperty( ItemView::Property::LAYOUT ).Get( getLayoutArray ) );
//Check that the result is the same as
DALI_TEST_EQUALS( layoutArray.Count(), getLayoutArray.Count(), TEST_LOCATION );
DALI_TEST_EQUALS(number, 4, TEST_LOCATION );
}
}
- view.SetProperty( DevelItemView::Property::LAYOUT, layoutArray);
+ view.SetProperty( ItemView::Property::LAYOUT, layoutArray);
// Test "overshootEnabled" property
int UtcDaliItemViewOvershootVertical(void)
{
ToolkitTestApplication application;
- Dali::Stage stage = Dali::Stage::GetCurrent();
+ Dali::Integration::Scene stage = application.GetScene();
// Create the ItemView actor
TestItemFactory factory;
// Do a pan starting from 100,100 and moving down
Vector2 pos(100.0f, 100.0f);
- SendPan(application, Gesture::Possible, pos);
- SendPan(application, Gesture::Started, pos);
+
+ application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+
pos.y += 5.0f;
Wait(application, 100);
for(int i = 0;i<200;i++)
{
- SendPan(application, Gesture::Continuing, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
pos.y += 5.0f;
Wait(application);
}
- SendPan(application, Gesture::Finished, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
+
Wait(application, 100);
// Do a pan starting from 100,100 and moving up
pos = Vector2(100.0f, 300.0f);
- SendPan(application, Gesture::Possible, pos);
- SendPan(application, Gesture::Started, pos);
+
+ application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
+
pos.y -= 5.0f;
Wait(application, 100);
for(int i = 0;i<200;i++)
{
- SendPan(application, Gesture::Continuing, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
pos.y -= 5.0f;
Wait(application);
}
- SendPan(application, Gesture::Finished, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
Wait(application, 100);
END_TEST;
}
int UtcDaliItemViewOvershootHorizontal(void)
{
ToolkitTestApplication application;
- Dali::Stage stage = Dali::Stage::GetCurrent();
+ Dali::Integration::Scene stage = application.GetScene();
// Create the ItemView actor
TestItemFactory factory;
// Do a pan starting from 100,100 and moving left
Vector2 pos(100.0f, 100.0f);
- SendPan(application, Gesture::Possible, pos);
- SendPan(application, Gesture::Started, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ));
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ));
pos.x -= 5.0f;
Wait(application, 100);
for(int i = 0;i<200;i++)
{
- SendPan(application, Gesture::Continuing, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
pos.x -= 5.0f;
Wait(application);
}
- SendPan(application, Gesture::Finished, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
Wait(application, 100);
// Do a pan starting from 100,100 and moving right
pos = Vector2(100.0f, 100.0f);
- SendPan(application, Gesture::Possible, pos);
- SendPan(application, Gesture::Started, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::DOWN, pos, 100 ) );
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
pos.x += 5.0f;
Wait(application, 100);
for(int i = 0;i<200;i++)
{
- SendPan(application, Gesture::Continuing, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::MOTION, pos, 100 ) );
pos.x += 5.0f;
Wait(application);
}
- SendPan(application, Gesture::Finished, pos);
+ application.ProcessEvent( GenerateSingleTouch(PointState::UP, pos, 100 ) );
Wait(application, 100);
END_TEST;
int UtcDaliItemEnableDisableRefresh(void)
{
ToolkitTestApplication application;
- Dali::Stage stage = Dali::Stage::GetCurrent();
+ Dali::Integration::Scene stage = application.GetScene();
// Create the ItemView actor
TestItemFactory factory;
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;
+}
projects / platform / core / uifw / dali-toolkit.git / blobdiff