/*
- * Copyright (c) 2022 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 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.
ToolkitTestApplication::ToolkitTestApplication(size_t surfaceWidth, size_t surfaceHeight, float horizontalDpi, float verticalDpi)
: TestApplication(surfaceWidth, surfaceHeight, horizontalDpi, verticalDpi, false /* Do not Initialize Core */),
- mMainWindow(new Dali::Window),
+ mMainWindow(),
mAdaptor(&AdaptorImpl::New()) // Need to create Adaptor first as many singletons in dali-adaptor need it
{
// Create Core next
// Override Scene creation in TestApplication by creating a window.
// The window will create a Scene & surface and set up the scene's surface appropriately.
- *mMainWindow = Window::New(PositionSize(0, 0, surfaceWidth, surfaceHeight), "");
- mScene = AdaptorImpl::GetScene(*mMainWindow);
+ mMainWindow = Window::New(PositionSize(0, 0, surfaceWidth, surfaceHeight), "");
+ mScene = AdaptorImpl::GetScene(mMainWindow);
mScene.SetDpi(Vector2(horizontalDpi, verticalDpi));
// Create render target for the scene
rtInfo.SetExtent({mSurfaceWidth, mSurfaceHeight});
mScene.SetSurfaceRenderTarget(rtInfo);
+ mScenes.push_back(mScene);
+
// Core needs to be initialized next before we start the adaptor
InitializeCore();
- Accessibility::Accessible::SetObjectRegistry(mCore->GetObjectRegistry());
// This will also emit the window created signals
- AdaptorImpl::GetImpl(*mAdaptor).Start(*mMainWindow);
+ AdaptorImpl::GetImpl(*mAdaptor).Start(mMainWindow);
AdaptorImpl::GetImpl(*mAdaptor).SetApplication(*this);
Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
ToolkitTestApplication::~ToolkitTestApplication()
{
+ Dali::LifecycleController lifecycleController = Dali::LifecycleController::Get();
+ lifecycleController.TerminateSignal().Emit();
+
+ // Stop adaptor after terminate signal emit
+ if(Dali::Adaptor::IsAvailable() && mAdaptor)
+ {
+ mAdaptor->Stop();
+ }
+
// Need to delete core before we delete the adaptor.
delete mCore;
mCore = NULL;