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] Modify DALI_KEY_H"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
public-api
/
adaptor-framework
/
application.cpp
diff --git
a/dali/public-api/adaptor-framework/application.cpp
b/dali/public-api/adaptor-framework/application.cpp
index
188e382
..
8aa2318
100644
(file)
--- a/
dali/public-api/adaptor-framework/application.cpp
+++ b/
dali/public-api/adaptor-framework/application.cpp
@@
-37,6
+37,8
@@
Application Application::New( int* argc, char **argv[] )
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
+ // pre-initialized application
+ internal->SetCommandLineOptions( argc, argv );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
@@
-57,6
+59,8
@@
Application Application::New( int* argc, char **argv[], const std::string& style
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
+ // pre-initialized application
+ internal->SetCommandLineOptions( argc, argv );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
@@
-78,6
+82,8
@@
Application Application::New( int* argc, char **argv[], const std::string& style
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
+ // pre-initialized application
+ internal->SetCommandLineOptions( argc, argv );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
@@
-101,6
+107,8
@@
Application Application::New( int* argc, char **argv[], const std::string& style
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
Internal::Adaptor::ApplicationPtr internal = Internal::Adaptor::Application::GetPreInitializedApplication();
if( internal )
{
+ // pre-initialized application
+ internal->SetCommandLineOptions( argc, argv );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
if( argc && ( *argc > 0 ) )
{
internal->GetWindow().SetClass( (*argv)[0], "" );
@@
-174,6
+182,8
@@
Window Application::GetWindow()
void Application::ReplaceWindow(PositionSize windowPosition, const std::string& name)
{
void Application::ReplaceWindow(PositionSize windowPosition, const std::string& name)
{
+ DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ReplaceWindow is deprecated and will be removed from next release.\n" );
+
Internal::Adaptor::GetImplementation(*this).ReplaceWindow(windowPosition, name);
}
Internal::Adaptor::GetImplementation(*this).ReplaceWindow(windowPosition, name);
}
@@
-192,22
+202,24
@@
std::string Application::GetLanguage() const
return Internal::Adaptor::GetImplementation(*this).GetLanguage();
}
return Internal::Adaptor::GetImplementation(*this).GetLanguage();
}
-void Application::SetViewMode( ViewMode
/*viewMode*/
)
+void Application::SetViewMode( ViewMode
viewMode
)
{
{
+ Internal::Adaptor::GetImplementation(*this).SetViewMode( viewMode );
}
ViewMode Application::GetViewMode() const
{
}
ViewMode Application::GetViewMode() const
{
- return
ViewMode::MONO
;
+ return
Internal::Adaptor::GetImplementation(*this).GetViewMode()
;
}
}
-void Application::SetStereoBase( float
/*stereoBase*/
)
+void Application::SetStereoBase( float
stereoBase
)
{
{
+ Internal::Adaptor::GetImplementation(*this).SetStereoBase( stereoBase );
}
float Application::GetStereoBase() const
{
}
float Application::GetStereoBase() const
{
- return
0.f
;
+ return
Internal::Adaptor::GetImplementation(*this).GetStereoBase()
;
}
Application::AppSignalType& Application::InitSignal()
}
Application::AppSignalType& Application::InitSignal()