/*
- * Copyright (c) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 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.
const int RENDER_ANIMATION_TEST_DURATION_MS = 2000; ///< 2000ms to test animation.
const int RENDER_ANIMATION_TEST_DURATION_FRAMES = RENDER_ANIMATION_TEST_DURATION_MS / RENDER_FRAME_INTERVAL; ///< equivalent frames.
const Vector3 DEFAULT_BUTTON_SIZE(100.0f, 50.0f, 0.0f);
-const Dali::TouchPoint pointDownOutside( 0, TouchPoint::Down, 10.0f, 10.0f );
-const Dali::TouchPoint pointUpOutside( 0, TouchPoint::Up, 10.0f, 10.0f );
+
+Dali::Integration::Point GetPointDown()
+{
+ Dali::Integration::Point point;
+ point.SetState( PointState::DOWN );
+ point.SetScreenPosition( Vector2( 10, 10 ) );
+ return point;
+}
+
+Dali::Integration::Point GetPointUp()
+{
+ Dali::Integration::Point point;
+ point.SetState( PointState::UP );
+ point.SetScreenPosition( Vector2( 10, 10 ) );
+ return point;
+}
/**
* Counts how many descendants root Actor has, including
int keyCode,
int keyModifier,
unsigned long timeStamp,
- const Integration::KeyEvent::State& keyState )
+ const Integration::KeyEvent::State& keyState,
+ const std::string& deviceName = "",
+ const Device::Class::Type& deviceClass = Device::Class::NONE,
+ const Device::Subclass::Type& deviceSubclass = Device::Subclass::NONE
+ )
{
return Integration::KeyEvent( keyName,
keyString,
keyCode,
keyModifier,
timeStamp,
- keyState );
+ keyState,
+ deviceName,
+ deviceClass,
+ deviceSubclass );
}
} // Anonymous namespace
Dali::Integration::TouchEvent event;
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointDownOutside );
+ event.AddPoint( GetPointDown() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointUpOutside );
+ event.AddPoint( GetPointUp() );
application.ProcessEvent( event );
application.SendNotification();
popup.SetProperty( Popup::Property::TOUCH_TRANSPARENT, true );
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointDownOutside );
+ event.AddPoint( GetPointDown() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointUpOutside );
+ event.AddPoint( GetPointUp() );
application.ProcessEvent( event );
application.SendNotification();
// Test all contextual modes.
const char* mode[5] = { "NON_CONTEXTUAL", "ABOVE", "RIGHT", "BELOW", "LEFT" };
Vector2 offsetValues[5];
- offsetValues[0] = Vector2( 0.0f, 0.0f );
- offsetValues[1] = Vector2( 0.0f, -10.0f );
- offsetValues[2] = Vector2( 10.0f, 0.0f );
- offsetValues[3] = Vector2( 0.0f, 10.0f );
- offsetValues[4] = Vector2( -10.0f, 0.0f );
+ offsetValues[0] = Vector2( 0.375f, 0.0f );
+ offsetValues[1] = Vector2( -0.125f, -10.5f );
+ offsetValues[2] = Vector2( 10.875f, -0.5f );
+ offsetValues[3] = Vector2( -0.125f, 10.5f );
+ offsetValues[4] = Vector2( -10.875f, -0.5f );
for( int i = 0; i < 5; ++i )
{
popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
Stage::GetCurrent().Add( popup );
- Actor backing = popup.FindChildByName( "popup-backing" );
+ Actor backing = popup.FindChildByName( "popupBacking" );
DALI_TEST_CHECK( backing );
DALI_TEST_EQUALS( backing.GetCurrentOpacity(), 1.0f, Math::MACHINE_EPSILON_0, TEST_LOCATION );
Popup popup = Popup::New();
Stage::GetCurrent().Add( popup );
- // Check setting an invalid image.
+ // Check setting an image
popup.SetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE, "invalid-image.png" );
std::string resultString;
popup.GetProperty( Toolkit::Popup::Property::POPUP_BACKGROUND_IMAGE ).Get( resultString );
- DALI_TEST_EQUALS( resultString, std::string(""), TEST_LOCATION );
+ DALI_TEST_EQUALS( resultString, "invalid-image.png", TEST_LOCATION );
END_TEST;
}
popup.SetProperty( Popup::Property::ANIMATION_DURATION, 1.0f );
popup.SetProperty( Popup::Property::ANIMATION_MODE, "CUSTOM" );
- Actor popupContainer = popup.FindChildByName( "popup-container" );
+ Actor popupContainer = popup.FindChildByName( "popupContainer" );
DALI_TEST_CHECK( popupContainer );
Vector3 entryAnimationDestination( 300.0f, 200.0f, 0.0f );
Vector3 exitAnimationDestination( -300.0f, -200.0f, 0.0f );
Property::Map animationMapEntry;
- animationMapEntry.Insert( "actor", "custom-animation-popup" );
+ animationMapEntry.Insert( "actor", "customAnimationPopup" );
animationMapEntry.Insert( "property", "position" );
animationMapEntry.Insert( "value", entryAnimationDestination );
- animationMapEntry.Insert( "alpha-function", "EASE_OUT" );
+ animationMapEntry.Insert( "alphaFunction", "EASE_OUT" );
Property::Array timePeriodMapEntry;
timePeriodMapEntry.PushBack( 0.0f );
timePeriodMapEntry.PushBack( 1.0f );
- animationMapEntry.Insert( "time-period", timePeriodMapEntry );
+ animationMapEntry.Insert( "timePeriod", timePeriodMapEntry );
Property::Map animationMapExit;
- animationMapExit.Insert( "actor", "custom-animation-popup" );
+ animationMapExit.Insert( "actor", "customAnimationPopup" );
animationMapExit.Insert( "property", "position" );
animationMapExit.Insert( "value", exitAnimationDestination );
- animationMapExit.Insert( "alpha-function", "EASE_IN" );
+ animationMapExit.Insert( "alphaFunction", "EASE_IN" );
Property::Array timePeriodMapExit;
timePeriodMapExit.PushBack( 0.0f );
timePeriodMapExit.PushBack( 1.0f );
- animationMapExit.Insert( "time-period", timePeriodMapExit );
+ animationMapExit.Insert( "timePeriod", timePeriodMapExit );
popup.SetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION, animationMapEntry );
popup.SetProperty( Toolkit::Popup::Property::EXIT_ANIMATION, animationMapExit );
Property::Map resultMap;
DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::ENTRY_ANIMATION ).Get( resultMap ) );
- DALI_TEST_EQUALS( resultMap.Count(), 0, TEST_LOCATION );
+ DALI_TEST_EQUALS( resultMap.Count(), 0u, TEST_LOCATION );
DALI_TEST_CHECK( popup.GetProperty( Toolkit::Popup::Property::EXIT_ANIMATION ).Get( resultMap ) );
- DALI_TEST_EQUALS( resultMap.Count(), 0, TEST_LOCATION );
+ DALI_TEST_EQUALS( resultMap.Count(), 0u, TEST_LOCATION );
Stage::GetCurrent().Add( popup );
popup.SetDisplayState( Popup::SHOWN );
gPushButtonClicked = false;
Dali::Integration::TouchEvent event;
- const Dali::TouchPoint pointDown( 0, TouchPoint::Down, 10.0f, 10.0f );
- const Dali::TouchPoint pointUp( 0, TouchPoint::Up, 10.0f, 10.0f );
// Perform a click, the popup should block the click from hitting the button.
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointDown );
+ event.AddPoint( GetPointDown() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointUp );
+ event.AddPoint( GetPointUp() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
// Perform a click, the popup should allow the click to travel through to the button.
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointDown );
+ event.AddPoint( GetPointDown() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
event = Dali::Integration::TouchEvent();
- event.AddPoint( pointUp );
+ event.AddPoint( GetPointUp() );
application.ProcessEvent( event );
application.SendNotification();
application.Render();
popup.SetDisplayState( Popup::SHOWN );
application.SendNotification();
application.Render();
- tailActor = popup.FindChildByName( "tail-image" );
+ tailActor = popup.FindChildByName( "tailImage" );
DALI_TEST_CHECK( tailActor );
float baseValX = tailActor.GetCurrentWorldPosition().x;
popup.SetDisplayState( Popup::SHOWN );
application.SendNotification();
application.Render();
- tailActor = popup.FindChildByName( "tail-image" );
+ tailActor = popup.FindChildByName( "tailImage" );
DALI_TEST_CHECK( tailActor );
float baseValY = tailActor.GetCurrentWorldPosition().y;
popup.SetDisplayState( Popup::SHOWN );
application.SendNotification();
application.Render();
- tailActor = popup.FindChildByName( "tail-image" );
+ tailActor = popup.FindChildByName( "tailImage" );
DALI_TEST_CHECK( tailActor );
DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
popup.SetDisplayState( Popup::SHOWN );
application.SendNotification();
application.Render();
- tailActor = popup.FindChildByName( "tail-image" );
+ tailActor = popup.FindChildByName( "tailImage" );
DALI_TEST_CHECK( tailActor );
DALI_TEST_GREATER( tailActor.GetCurrentWorldPosition().x, baseValX, TEST_LOCATION );
DALI_TEST_EQUALS( tailActor.GetCurrentWorldPosition().y, baseValY, TEST_LOCATION );
ToolkitTestApplication application;
tet_infoline( " UtcDaliPopupTypeToast" );
- TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "popup-toast" );
+ TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "PopupToast" );
DALI_TEST_CHECK( typeInfo )
BaseHandle baseHandle = typeInfo.CreateInstance();
TestConnectionTrackerObject* testTracker = new TestConnectionTrackerObject();
// Note: The emmision of this signals has already been tested in other tests.
- DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "touched-outside", PopupTestFunctor() ) );
+ DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "touchedOutside", PopupTestFunctor() ) );
DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "showing", PopupTestFunctor() ) );
DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "shown", PopupTestFunctor() ) );
DALI_TEST_CHECK( popup.ConnectSignal( testTracker, "hiding", PopupTestFunctor() ) );
popup.SetKeyInputFocus();
- application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down ) );
+ application.ProcessEvent( GenerateKey( "", "", DALI_KEY_ESCAPE, 0, 0, Integration::KeyEvent::Down, "", Device::Class::TOUCH, Device::Subclass::NONE ) );
application.SendNotification();
application.Render();
END_TEST;
}
+
+int UtcDaliPopupSetPopupBackgroundBorderProperty(void)
+{
+ ToolkitTestApplication application;
+
+ tet_infoline( "Set the background border property of a popup & retrieve it" );
+ Popup popup = Popup::New();
+
+ Rect< int > rect( 40, 30, 20, 10 );
+ tet_infoline( "Ensure value we want to set is different from what is already set" );
+ DALI_TEST_CHECK( rect != popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >() );
+
+ tet_infoline( "Set the property and retrieve it to make sure it's the value we set" );
+ popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, rect );
+ DALI_TEST_EQUALS( rect, popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+
+ tet_infoline( "Set a vector4 as well which should also work" );
+ Vector4 vectorValue( 10.0f, 20.0f, 30.0f, 40.0f );
+ popup.SetProperty( Popup::Property::POPUP_BACKGROUND_BORDER, vectorValue );
+ DALI_TEST_EQUALS( Rect< int >( 10, 20, 30, 40 ), popup.GetProperty( Popup::Property::POPUP_BACKGROUND_BORDER ).Get< Rect< int > >(), TEST_LOCATION );
+
+ END_TEST;
+}
projects / platform / core / uifw / dali-toolkit.git / blobdiff