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
6f58fba
..
94196b7
100755
(executable)
--- a/
dali/internal/adaptor/common/application-impl.cpp
+++ b/
dali/internal/adaptor/common/application-impl.cpp
@@
-24,6
+24,7
@@
// INTERNAL INCLUDES
#include <dali/devel-api/adaptor-framework/style-monitor.h>
#include <dali/devel-api/text-abstraction/font-client.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>
@@
-241,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 );
@@
-441,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;