From 6aa19cc13d3469d294bf0c30ee0c89f949ab5841 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Wed, 12 Feb 2020 13:40:57 +0900 Subject: [PATCH] [Tizen] Temporarily modified so that window is no null This reverts commit 7aa3faac1fecbb3968c3943dece65b2eb87dfcc0. --- .../widget-application-impl-tizen.cpp | 4 ++-- dali/public-api/adaptor-framework/window.cpp | 28 +++++++--------------- 2 files changed, 10 insertions(+), 22 deletions(-) diff --git a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp index ff22534..2b4b480 100644 --- a/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp +++ b/dali/internal/system/tizen-wayland/widget-application-impl-tizen.cpp @@ -55,9 +55,9 @@ int OnInstanceInit(widget_base_instance_h instanceHandle, bundle *content, int w } else { - window = Dali::Window::New(PositionSize(0,0,w,h) ,"", false); - if( window ) + if(Internal::Adaptor::Adaptor::GetImplementation(application->GetAdaptor()).IsMultipleWindowSupported()) { + window = Dali::Window::New(PositionSize(0,0,w,h) ,"", false); DALI_LOG_RELEASE_INFO("Widget Instance create new Window (win:%p, cnt:%d) (%dx%d) (id:%s )\n", window, application->GetWidgetCount(), w, h, std::string(id).c_str()); } else diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index 08562d0..9da92dd 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -34,39 +34,27 @@ class DALI_INTERNAL DragAndDropDetector : public BaseHandle {}; // Empty class o Window Window::New(PositionSize posSize, const std::string& name, bool isTransparent) { Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, "", isTransparent); - Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get(); - if( Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() ) - { - Integration::SceneHolder sceneHolder = Integration::SceneHolder( window ); - Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, "", isTransparent ); - - return Window(window); - } - else + Integration::SceneHolder sceneHolder = Integration::SceneHolder( window ); + Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, "", isTransparent ); + if( !Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() ) { DALI_LOG_ERROR("This device can't support multiple windows.\n"); - return Window(); } + return Window(window); } Window Window::New(PositionSize posSize, const std::string& name, const std::string& className, bool isTransparent) { Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent); - Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get(); - if( Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() ) - { - Integration::SceneHolder sceneHolder = Integration::SceneHolder( window ); - Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, className, isTransparent ); - - return Window(window); - } - else + Integration::SceneHolder sceneHolder = Integration::SceneHolder( window ); + Internal::Adaptor::Adaptor::GetImplementation( adaptor ).AddWindow( sceneHolder, name, className, isTransparent ); + if( !Internal::Adaptor::Adaptor::GetImplementation( adaptor ).IsMultipleWindowSupported() ) { DALI_LOG_ERROR("This device can't support multiple windows.\n"); - return Window(); } + return Window(window); } Window::Window() -- 2.7.4