/*
- * Copyright (c) 2015 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.
DALI_TEST_CHECK( popup2 == popup );
// 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;
popup.SetFooter( footerActor );
- // Tell the confirmation popup to connect to the signal in our button called "onStage".
- popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onStage" );
+ // Tell the confirmation popup to connect to the signal in our button called "onScene".
+ popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
std::string resultProperty;
DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED ).Get( resultProperty ) );
- DALI_TEST_EQUALS( resultProperty, "onStage", TEST_LOCATION );
+ DALI_TEST_EQUALS( resultProperty, "onScene", TEST_LOCATION );
// Connect to the confirmation popup's OK signal. This signal is dynamically created upon connection.
gSignalReceivedOK = false;
DALI_TEST_CHECK( !gSignalReceivedCancel );
// Provoke the signal.
- Stage::GetCurrent().Add( popup );
+ application.GetScene().Add( popup );
// Check the signal has occurred.
DALI_TEST_CHECK( gSignalReceivedOK );
// Remove the popup from the stage, and connect the cancel signal.
popup.Unparent();
- popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onStage" );
+ popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED, "onScene" );
DALI_TEST_CHECK( popup.GetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_CANCEL_SELECTED ).Get( resultProperty ) );
- DALI_TEST_EQUALS( resultProperty, "onStage", TEST_LOCATION );
+ DALI_TEST_EQUALS( resultProperty, "onScene", TEST_LOCATION );
popup.ConnectSignal( testTracker, "controlSignalCancel", ConfirmationPopupCancelTestFunctor() );
DALI_TEST_CHECK( !gSignalReceivedCancel );
// Provoke the signal.
- Stage::GetCurrent().Add( popup );
+ application.GetScene().Add( popup );
// Check the cancel signal has occurred.
DALI_TEST_CHECK( gSignalReceivedOK );
buttonOK.SetProperty( Dali::Actor::Property::NAME, "controlOkMisnamed" );
popup.SetFooter( buttonOK );
- // Tell the confirmation popup to connect to the signal in our button called "onStage".
- popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onStage" );
+ // Tell the confirmation popup to connect to the signal in our button called "onScene".
+ popup.SetProperty( Toolkit::ConfirmationPopup::Property::CONNECT_SIGNAL_OK_SELECTED, "onScene" );
// Connect to the confirmation popup's OK signal.
gSignalReceivedOK = false;
DALI_TEST_CHECK( !gSignalReceivedOK );
// Provoke the signal.
- Stage::GetCurrent().Add( popup );
+ application.GetScene().Add( popup );
// Check the signal has still not occurred, as our button was incorrectly named.
DALI_TEST_CHECK( !gSignalReceivedOK );
Toolkit::Popup popup = Toolkit::Popup::DownCast( baseHandle );
popup.SetProperty( Popup::Property::ANIMATION_DURATION, 0.0f );
- Stage::GetCurrent().Add( popup );
+ application.GetScene().Add( popup );
popup.SetDisplayState( Toolkit::Popup::SHOWN );
application.SendNotification();