projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen](ATSPI) squashed implementation"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
adaptor
/
common
/
application-impl.cpp
diff --git
a/dali/internal/adaptor/common/application-impl.cpp
b/dali/internal/adaptor/common/application-impl.cpp
index
b90e743
..
94196b7
100755
(executable)
--- a/
dali/internal/adaptor/common/application-impl.cpp
+++ b/
dali/internal/adaptor/common/application-impl.cpp
@@
-23,6
+23,8
@@
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/style-monitor.h>
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/style-monitor.h>
+#include <dali/devel-api/text-abstraction/font-client.h>
+#include <dali/internal/adaptor/common/adaptor-impl.h>
#include <dali/internal/system/common/command-line-options.h>
#include <dali/internal/adaptor/common/framework.h>
#include <dali/internal/system/common/singleton-service-impl.h>
#include <dali/internal/system/common/command-line-options.h>
#include <dali/internal/adaptor/common/framework.h>
#include <dali/internal/system/common/singleton-service-impl.h>
@@
-83,6
+85,11
@@
void Application::PreInitialize( int* argc, char** argv[] )
gPreInitializedApplication->CreateWindow(); // Only create window
gPreInitializedApplication->mLaunchpadState = Launchpad::PRE_INITIALIZED;
gPreInitializedApplication->CreateWindow(); // Only create window
gPreInitializedApplication->mLaunchpadState = Launchpad::PRE_INITIALIZED;
+
+ //Make DefaultFontDescription cached
+ Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get();
+ Dali::TextAbstraction::FontDescription defaultFontDescription;
+ fontClient.GetDefaultPlatformFontDescription( defaultFontDescription );
}
}
}
}
@@
-161,7
+168,9
@@
void Application::CreateWindow()
}
const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName();
}
const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName();
- mMainWindow = Dali::Window::New( mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT );
+
+ Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( mWindowPositionSize, mMainWindowName, windowClassName, mMainWindowMode == Dali::Application::TRANSPARENT );
+ mMainWindow = Dali::Window( window );
// Quit the application when the window is closed
GetImplementation( mMainWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit );
// Quit the application when the window is closed
GetImplementation( mMainWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit );
@@
-173,11
+182,13
@@
void Application::CreateAdaptor()
auto graphicsFactory = mAdaptorBuilder->GetGraphicsFactory();
auto graphicsFactory = mAdaptorBuilder->GetGraphicsFactory();
- mAdaptor = Dali::Internal::Adaptor::Adaptor::New( graphicsFactory, mMainWindow, mContextLossConfiguration, &mEnvironmentOptions );
+ Integration::SceneHolder sceneHolder = Integration::SceneHolder( &Dali::GetImplementation( mMainWindow ) );
+
+ mAdaptor = Adaptor::New( graphicsFactory, sceneHolder, mContextLossConfiguration, &mEnvironmentOptions );
mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
mAdaptor->ResizedSignal().Connect( mSlotDelegate, &Application::OnResize );
-
Internal::Adaptor::
Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface );
+ Adaptor::GetImplementation( *mAdaptor ).SetUseRemoteSurface( mUseRemoteSurface );
}
void Application::CreateAdaptorBuilder()
}
void Application::CreateAdaptorBuilder()
@@
-231,12
+242,6
@@
void Application::OnInit()
// Run the adaptor
mAdaptor->Start();
// Run the adaptor
mAdaptor->Start();
- // Check if user requires no vsyncing and set Adaptor
- if (mCommandLineOptions->noVSyncOnRender)
- {
- mAdaptor->SetUseHardwareVSync(false);
- }
-
if( ! mStylesheet.empty() )
{
Dali::StyleMonitor::Get().SetTheme( mStylesheet );
if( ! mStylesheet.empty() )
{
Dali::StyleMonitor::Get().SetTheme( mStylesheet );
@@
-375,7
+380,15
@@
Dali::Window Application::GetWindow()
{
// Changed to return a different window handle after ReplaceWindow is called
// just for backward compatibility to make the test case pass
{
// Changed to return a different window handle after ReplaceWindow is called
// just for backward compatibility to make the test case pass
- return mMainWindowReplaced ? Dali::Window::New( PositionSize(), "ReplacedWindow" ) : mMainWindow;
+ if ( mMainWindowReplaced )
+ {
+ Internal::Adaptor::Window* window = Internal::Adaptor::Window::New( PositionSize(), "ReplacedWindow", "", false );
+ return Dali::Window( window );
+ }
+ else
+ {
+ return mMainWindow;
+ }
}
// Stereoscopy
}
// Stereoscopy
@@
-423,6
+436,15
@@
void Application::SetStyleSheet( const std::string& stylesheet )
mStylesheet = stylesheet;
}
mStylesheet = stylesheet;
}
+void Application::SetCommandLineOptions( int* argc, char **argv[] )
+{
+ delete mCommandLineOptions;
+
+ mCommandLineOptions = new CommandLineOptions( argc, argv );
+
+ mFramework->SetCommandLineOptions( argc, argv );
+}
+
ApplicationPtr Application::GetPreInitializedApplication()
{
return gPreInitializedApplication;
ApplicationPtr Application::GetPreInitializedApplication()
{
return gPreInitializedApplication;