/*
- * Copyright (c) 2018 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.
*/
// CLASS HEADER
-#include <dali/integration-api/adaptor.h>
+#include <dali/integration-api/adaptor-framework/adaptor.h>
// EXTERNAL INCLUDES
+#include <dali/public-api/object/object-registry.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/accessibility-adaptor.h>
#include <dali/devel-api/adaptor-framework/style-monitor.h>
-#include <dali/integration-api/render-surface.h>
+#include <dali/integration-api/adaptor-framework/render-surface-interface.h>
+#include <dali/integration-api/adaptor-framework/scene-holder.h>
#include <dali/internal/adaptor/common/adaptor-impl.h>
+#include <dali/internal/window-system/common/window-impl.h>
namespace Dali
{
Adaptor& Adaptor::New( Window window )
{
- return New( window, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
+ Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window );
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), NULL );
+ return *adaptor;
}
-Adaptor& Adaptor::New( Window window, Configuration::ContextLoss configuration )
+Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface )
{
- Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, configuration, NULL );
+ Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window );
+ Dali::RenderSurfaceInterface* pSurface = const_cast<Dali::RenderSurfaceInterface *>(&surface);
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( Dali::Integration::SceneHolder( sceneHolder ), pSurface, NULL );
return *adaptor;
}
-Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface )
+Adaptor& Adaptor::New( Dali::Integration::SceneHolder window )
{
- return New( window, surface, Configuration::APPLICATION_DOES_NOT_HANDLE_CONTEXT_LOSS );
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, NULL );
+ return *adaptor;
}
-Adaptor& Adaptor::New( Window window, const Dali::RenderSurfaceInterface& surface, Configuration::ContextLoss configuration )
+Adaptor& Adaptor::New( Dali::Integration::SceneHolder window, const Dali::RenderSurfaceInterface& surface )
{
Dali::RenderSurfaceInterface* pSurface = const_cast<Dali::RenderSurfaceInterface *>(&surface);
- Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, pSurface, configuration, NULL );
+ Adaptor* adaptor = Internal::Adaptor::Adaptor::New( window, pSurface, NULL );
return *adaptor;
}
bool Adaptor::AddIdle( CallbackBase* callback, bool hasReturnValue )
{
+ DALI_ASSERT_ALWAYS( IsAvailable() && "Adaptor not instantiated" );
return mImpl->AddIdle( callback, hasReturnValue, false );
}
+bool Adaptor::AddWindow( Dali::Integration::SceneHolder childWindow )
+{
+ DALI_ASSERT_ALWAYS( IsAvailable() && "Adaptor not instantiated" );
+ return mImpl->AddWindow( childWindow );
+}
+
void Adaptor::RemoveIdle( CallbackBase* callback )
{
+ DALI_ASSERT_ALWAYS( IsAvailable() && "Adaptor not instantiated" );
mImpl->RemoveIdle( callback );
}
+void Adaptor::ProcessIdle()
+{
+ DALI_ASSERT_ALWAYS( IsAvailable() && "Adaptor not instantiated" );
+ mImpl->ProcessIdle();
+}
+
void Adaptor::ReplaceSurface( Window window, Dali::RenderSurfaceInterface& surface )
{
+ Internal::Adaptor::SceneHolder* sceneHolder = &Dali::GetImplementation( window );
+ mImpl->ReplaceSurface( Dali::Integration::SceneHolder( sceneHolder ), surface );
+}
+
+void Adaptor::ReplaceSurface( Dali::Integration::SceneHolder window, Dali::RenderSurfaceInterface& surface )
+{
mImpl->ReplaceSurface( window, surface );
}
return mImpl->LanguageChangedSignal();
}
+Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal()
+{
+ return mImpl->WindowCreatedSignal();
+}
+
Dali::RenderSurfaceInterface& Adaptor::GetSurface()
{
return mImpl->GetSurface();
return mImpl->GetNativeWindowHandle();
}
+Any Adaptor::GetNativeWindowHandle( Actor actor )
+{
+ return mImpl->GetNativeWindowHandle( actor );
+}
+
Any Adaptor::GetGraphicsDisplay()
{
return mImpl->GetGraphicsDisplay();
mImpl->SetPreRenderCallback( callback );
}
-void Adaptor::SetUseHardwareVSync(bool useHardware)
-{
- mImpl->SetUseHardwareVSync( useHardware );
-}
-
Adaptor& Adaptor::Get()
{
return Internal::Adaptor::Adaptor::Get();
mImpl->NotifyLanguageChanged();
}
-void Adaptor::SetMinimumPinchDistance(float distance)
-{
- mImpl->SetMinimumPinchDistance(distance);
-}
-
void Adaptor::FeedTouchPoint( TouchPoint& point, int timeStamp )
{
mImpl->FeedTouchPoint(point, timeStamp);
mImpl->SceneCreated();
}
+void Adaptor::SurfaceResizePrepare( Dali::RenderSurfaceInterface* surface, SurfaceSize surfaceSize )
+{
+ mImpl->SurfaceResizePrepare( surface, surfaceSize );
+}
+
+void Adaptor::SurfaceResizeComplete( Dali::RenderSurfaceInterface* surface, SurfaceSize surfaceSize )
+{
+ mImpl->SurfaceResizeComplete( surface, surfaceSize );
+}
+
void Adaptor::RenderOnce()
{
mImpl->RenderOnce();
mImpl->UnregisterProcessor( processor );
}
+Dali::WindowContainer Adaptor::GetWindows() const
+{
+ return mImpl->GetWindows();
+}
+
+SceneHolderList Adaptor::GetSceneHolders() const
+{
+ return mImpl->GetSceneHolders();
+}
+
+Dali::ObjectRegistry Adaptor::GetObjectRegistry() const
+{
+ return mImpl->GetObjectRegistry();
+}
+
+void Adaptor::OnWindowShown()
+{
+ mImpl->OnWindowShown();
+}
+
+void Adaptor::OnWindowHidden()
+{
+ mImpl->OnWindowHidden();
+}
+
Adaptor::Adaptor()
: mImpl( NULL )
{