X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fadaptor-framework%2Fwindow.cpp;h=4e834a62e99d074d21824a274e0716e9a86dea63;hb=f79805402bf8bd9b7ceb4561d4c089411fb5927f;hp=ca734c2fe89c3395f55dce354c11f7252330e603;hpb=5ccadb7c0624b39fca29026a716ce7b721b89ffd;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 ca734c2..4e834a6 100644
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2020 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -22,13 +22,12 @@
 #include <dali/integration-api/debug.h>
 
 // INTERNAL INCLUDES
-#include <dali/public-api/actors/actor.h>
-#include <dali/internal/window-system/common/window-impl.h>
 #include <dali/internal/window-system/common/orientation-impl.h>
+#include <dali/internal/window-system/common/window-impl.h>
+#include <dali/public-api/actors/actor.h>
 
 namespace Dali
 {
-
 Window Window::New(PositionSize posSize, const std::string& name, bool isTransparent)
 {
   return Dali::Window::New(posSize, name, "", isTransparent);
@@ -39,21 +38,21 @@ Window Window::New(PositionSize posSize, const std::string& name, const std::str
   Window newWindow;
 
   const bool isAdaptorAvailable = Dali::Adaptor::IsAvailable();
-  bool isNewWindowAllowed = true;
+  bool       isNewWindowAllowed = true;
 
-  if (isAdaptorAvailable)
+  if(isAdaptorAvailable)
   {
     Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
-    isNewWindowAllowed = Internal::Adaptor::Adaptor::GetImplementation(adaptor).IsMultipleWindowSupported();
+    isNewWindowAllowed     = Internal::Adaptor::Adaptor::GetImplementation(adaptor).IsMultipleWindowSupported();
   }
 
-  if (isNewWindowAllowed)
+  if(isNewWindowAllowed)
   {
-    Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, isTransparent);
+    Internal::Adaptor::Window* window = Internal::Adaptor::Window::New(posSize, name, className, WindowType::NORMAL, isTransparent);
 
     Integration::SceneHolder sceneHolder = Integration::SceneHolder(window);
 
-    if (isAdaptorAvailable)
+    if(isAdaptorAvailable)
     {
       Dali::Adaptor& adaptor = Internal::Adaptor::Adaptor::Get();
       Internal::Adaptor::Adaptor::GetImplementation(adaptor).AddWindow(sceneHolder);
@@ -76,47 +75,57 @@ Window::~Window()
 {
 }
 
-Window::Window( const Window& copy ) = default;
+Window::Window(const Window& copy) = default;
+
+Window& Window::operator=(const Window& rhs) = default;
 
-Window& Window::operator=( const Window& rhs ) = default;
+Window::Window(Window&& rhs) noexcept = default;
 
-Window::Window( Window&& rhs ) = default;
+Window& Window::operator=(Window&& rhs) noexcept = default;
 
-Window& Window::operator=( Window&& rhs ) = default;
+Window Window::DownCast(BaseHandle handle)
+{
+  return Window(dynamic_cast<Dali::Internal::Adaptor::Window*>(handle.GetObjectPtr()));
+}
 
-void Window::Add( Dali::Actor actor )
+void Window::Add(Dali::Actor actor)
 {
-  GetImplementation( *this ).Add( actor );
+  GetImplementation(*this).Add(actor);
 }
 
-void Window::Remove( Dali::Actor actor )
+void Window::Remove(Dali::Actor actor)
 {
-  GetImplementation( *this ).Remove( actor );
+  GetImplementation(*this).Remove(actor);
 }
 
-void Window::SetBackgroundColor( const Vector4& color )
+void Window::SetBackgroundColor(const Vector4& color)
 {
-  GetImplementation( *this ).SetBackgroundColor( color );
+  GetImplementation(*this).SetBackgroundColor(color);
 }
 
 Vector4 Window::GetBackgroundColor() const
 {
-  return GetImplementation( *this ).GetBackgroundColor();
+  return GetImplementation(*this).GetBackgroundColor();
 }
 
 Layer Window::GetRootLayer() const
 {
-  return GetImplementation( *this ).GetRootLayer();
+  return GetImplementation(*this).GetRootLayer();
+}
+
+Layer Window::GetOverlayLayer()
+{
+  return GetImplementation(*this).GetOverlayLayer();
 }
 
 uint32_t Window::GetLayerCount() const
 {
-  return GetImplementation( *this ).GetLayerCount();
+  return GetImplementation(*this).GetLayerCount();
 }
 
-Layer Window::GetLayer( uint32_t depth ) const
+Layer Window::GetLayer(uint32_t depth) const
 {
-  return GetImplementation( *this ).GetLayer( depth );
+  return GetImplementation(*this).GetLayer(depth);
 }
 
 Uint16Pair Window::GetDpi() const
@@ -124,9 +133,9 @@ Uint16Pair Window::GetDpi() const
   return GetImplementation(*this).GetDpi();
 }
 
-void Window::SetClass( std::string name, std::string klass )
+void Window::SetClass(std::string name, std::string klass)
 {
-  GetImplementation(*this).SetClass( name, klass );
+  GetImplementation(*this).SetClass(name, klass);
 }
 
 void Window::Raise()
@@ -144,22 +153,22 @@ void Window::Activate()
   GetImplementation(*this).Activate();
 }
 
-void Window::AddAvailableOrientation( WindowOrientation orientation )
+void Window::AddAvailableOrientation(WindowOrientation orientation)
 {
-  GetImplementation(*this).AddAvailableOrientation( orientation );
+  GetImplementation(*this).AddAvailableOrientation(orientation);
 }
 
-void Window::RemoveAvailableOrientation( WindowOrientation orientation )
+void Window::RemoveAvailableOrientation(WindowOrientation orientation)
 {
-  GetImplementation(*this).RemoveAvailableOrientation( orientation );
+  GetImplementation(*this).RemoveAvailableOrientation(orientation);
 }
 
-void Window::SetPreferredOrientation( WindowOrientation orientation )
+void Window::SetPreferredOrientation(WindowOrientation orientation)
 {
-  GetImplementation(*this).SetPreferredOrientation( orientation );
+  GetImplementation(*this).SetPreferredOrientation(orientation);
 }
 
-Dali::Window::WindowOrientation Window::GetPreferredOrientation()
+WindowOrientation Window::GetPreferredOrientation()
 {
   return GetImplementation(*this).GetPreferredOrientation();
 }
@@ -174,9 +183,9 @@ Window::FocusChangeSignalType& Window::FocusChangeSignal()
   return GetImplementation(*this).FocusChangeSignal();
 }
 
-void Window::SetAcceptFocus( bool accept )
+void Window::SetAcceptFocus(bool accept)
 {
-  GetImplementation(*this).SetAcceptFocus( accept );
+  GetImplementation(*this).SetAcceptFocus(accept);
 }
 
 bool Window::IsFocusAcceptable() const
@@ -204,64 +213,64 @@ unsigned int Window::GetSupportedAuxiliaryHintCount() const
   return GetImplementation(*this).GetSupportedAuxiliaryHintCount();
 }
 
-std::string Window::GetSupportedAuxiliaryHint( unsigned int index ) const
+std::string Window::GetSupportedAuxiliaryHint(unsigned int index) const
 {
-  return GetImplementation(*this).GetSupportedAuxiliaryHint( index );
+  return GetImplementation(*this).GetSupportedAuxiliaryHint(index);
 }
 
-unsigned int Window::AddAuxiliaryHint( const std::string& hint, const std::string& value )
+unsigned int Window::AddAuxiliaryHint(const std::string& hint, const std::string& value)
 {
-  return GetImplementation(*this).AddAuxiliaryHint( hint, value );
+  return GetImplementation(*this).AddAuxiliaryHint(hint, value);
 }
 
-bool Window::RemoveAuxiliaryHint( unsigned int id )
+bool Window::RemoveAuxiliaryHint(unsigned int id)
 {
-  return GetImplementation(*this).RemoveAuxiliaryHint( id );
+  return GetImplementation(*this).RemoveAuxiliaryHint(id);
 }
 
-bool Window::SetAuxiliaryHintValue( unsigned int id, const std::string& value )
+bool Window::SetAuxiliaryHintValue(unsigned int id, const std::string& value)
 {
-  return GetImplementation(*this).SetAuxiliaryHintValue( id, value );
+  return GetImplementation(*this).SetAuxiliaryHintValue(id, value);
 }
 
-std::string Window::GetAuxiliaryHintValue( unsigned int id ) const
+std::string Window::GetAuxiliaryHintValue(unsigned int id) const
 {
-  return GetImplementation(*this).GetAuxiliaryHintValue( id );
+  return GetImplementation(*this).GetAuxiliaryHintValue(id);
 }
 
-unsigned int Window::GetAuxiliaryHintId( const std::string& hint ) const
+unsigned int Window::GetAuxiliaryHintId(const std::string& hint) const
 {
-  return GetImplementation(*this).GetAuxiliaryHintId( hint );
+  return GetImplementation(*this).GetAuxiliaryHintId(hint);
 }
 
-void Window::SetInputRegion( const Rect< int >& inputRegion )
+void Window::SetInputRegion(const Rect<int>& inputRegion)
 {
-  return GetImplementation(*this).SetInputRegion( inputRegion );
+  return GetImplementation(*this).SetInputRegion(inputRegion);
 }
 
-void Window::SetType( Window::Type type )
+void Window::SetType(WindowType type)
 {
-  GetImplementation(*this).SetType( type );
+  GetImplementation(*this).SetType(type);
 }
 
-Window::Type Window::GetType() const
+WindowType Window::GetType() const
 {
   return GetImplementation(*this).GetType();
 }
 
-bool Window::SetNotificationLevel( Window::NotificationLevel::Type level )
+WindowOperationResult Window::SetNotificationLevel(WindowNotificationLevel level)
 {
-  return GetImplementation(*this).SetNotificationLevel( level );
+  return GetImplementation(*this).SetNotificationLevel(level);
 }
 
-Window::NotificationLevel::Type Window::GetNotificationLevel() const
+WindowNotificationLevel Window::GetNotificationLevel() const
 {
   return GetImplementation(*this).GetNotificationLevel();
 }
 
-void Window::SetOpaqueState( bool opaque )
+void Window::SetOpaqueState(bool opaque)
 {
-  GetImplementation(*this).SetOpaqueState( opaque );
+  GetImplementation(*this).SetOpaqueState(opaque);
 }
 
 bool Window::IsOpaqueState() const
@@ -269,19 +278,19 @@ bool Window::IsOpaqueState() const
   return GetImplementation(*this).IsOpaqueState();
 }
 
-bool Window::SetScreenOffMode(Window::ScreenOffMode::Type screenMode)
+WindowOperationResult Window::SetScreenOffMode(WindowScreenOffMode screenMode)
 {
   return GetImplementation(*this).SetScreenOffMode(screenMode);
 }
 
-Window::ScreenOffMode::Type Window::GetScreenOffMode() const
+WindowScreenOffMode Window::GetScreenOffMode() const
 {
   return GetImplementation(*this).GetScreenOffMode();
 }
 
-bool Window::SetBrightness( int brightness )
+WindowOperationResult Window::SetBrightness(int brightness)
 {
-  return GetImplementation(*this).SetBrightness( brightness );
+  return GetImplementation(*this).SetBrightness(brightness);
 }
 
 int Window::GetBrightness() const
@@ -294,9 +303,9 @@ Window::ResizeSignalType& Window::ResizeSignal()
   return GetImplementation(*this).ResizeSignal();
 }
 
-void Window::SetSize( Window::WindowSize size )
+void Window::SetSize(Window::WindowSize size)
 {
-  GetImplementation(*this).SetSize( size );
+  GetImplementation(*this).SetSize(size);
 }
 
 Window::WindowSize Window::GetSize() const
@@ -304,19 +313,24 @@ Window::WindowSize Window::GetSize() const
   return GetImplementation(*this).GetSize();
 }
 
-void Window::SetPosition( Window::WindowPosition position )
+void Window::SetPosition(Dali::Window::WindowPosition position)
 {
-  GetImplementation(*this).SetPosition( position );
+  GetImplementation(*this).SetPosition(position);
 }
 
-Window::WindowPosition Window::GetPosition() const
+Dali::Window::WindowPosition Window::GetPosition() const
 {
   return GetImplementation(*this).GetPosition();
 }
 
-void Window::SetTransparency( bool transparent )
+void Window::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan)
+{
+  return GetImplementation(*this).SetLayout(numCols, numRows, column, row, colSpan, rowSpan);
+}
+
+void Window::SetTransparency(bool transparent)
 {
-  GetImplementation(*this).SetTransparency( transparent );
+  GetImplementation(*this).SetTransparency(transparent);
 }
 
 Dali::RenderTaskList Window::GetRenderTaskList()
@@ -329,13 +343,13 @@ Window::KeyEventSignalType& Window::KeyEventSignal()
   return GetImplementation(*this).KeyEventSignal();
 }
 
-Window::TouchSignalType& Window::TouchSignal()
+Window::TouchEventSignalType& Window::TouchedSignal()
 {
-  return GetImplementation(*this).TouchSignal();
+  return GetImplementation(*this).TouchedSignal();
 }
 
-Window::Window( Internal::Adaptor::Window* window )
-: BaseHandle( window )
+Window::Window(Internal::Adaptor::Window* window)
+: BaseHandle(window)
 {
 }