X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fadaptor-framework%2Fwindow.cpp;h=9da92dd2cbabd4186047a33bba3c80545e7b9146;hb=6aa19cc13d3469d294bf0c30ee0c89f949ab5841;hp=07ff286567b2728b158c440cbdbafdb2bc54299d;hpb=0f9ac19f22e942610bb1fb5f6fd06f743278d2ab;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git diff --git a/dali/public-api/adaptor-framework/window.cpp b/dali/public-api/adaptor-framework/window.cpp index 07ff286..9da92dd 100644 --- a/dali/public-api/adaptor-framework/window.cpp +++ b/dali/public-api/adaptor-framework/window.cpp @@ -34,22 +34,26 @@ 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(); 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(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(); 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(window); } @@ -165,7 +169,7 @@ void Window::RemoveAvailableOrientation( WindowOrientation orientation ) GetImplementation(*this).RemoveAvailableOrientation( orientation ); } -void Window::SetPreferredOrientation( Dali::Window::WindowOrientation orientation ) +void Window::SetPreferredOrientation( WindowOrientation orientation ) { GetImplementation(*this).SetPreferredOrientation( orientation ); } @@ -189,9 +193,15 @@ Any Window::GetNativeHandle() const Window::FocusSignalType& Window::FocusChangedSignal() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: FocusChangedSignal is deprecated and will be removed from next release.\n" ); return GetImplementation(*this).FocusChangedSignal(); } +Window::FocusChangeSignalType& Window::FocusChangeSignal() +{ + return GetImplementation(*this).FocusChangeSignal(); +} + void Window::SetAcceptFocus( bool accept ) { GetImplementation(*this).SetAcceptFocus( accept ); @@ -309,9 +319,15 @@ int Window::GetBrightness() const Window::ResizedSignalType& Window::ResizedSignal() { + DALI_LOG_WARNING_NOFN("DEPRECATION WARNING: ResizedSignal is deprecated and will be removed from next release.\n" ); return GetImplementation(*this).ResizedSignal(); } +Window::ResizeSignalType& Window::ResizeSignal() +{ + return GetImplementation(*this).ResizeSignal(); +} + void Window::SetSize( Window::WindowSize size ) { GetImplementation(*this).SetSize( size );