X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Fpublic-api%2Fadaptor-framework%2Fwindow.cpp;h=4e834a62e99d074d21824a274e0716e9a86dea63;hb=f79805402bf8bd9b7ceb4561d4c089411fb5927f;hp=0000add3597613d2b37ed318f7feac1409fc6d73;hpb=923eacde00895ed6e0c3fa9a6c3c2c0d6748ecbc;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 0000add..4e834a6 100644
--- a/dali/public-api/adaptor-framework/window.cpp
+++ b/dali/public-api/adaptor-framework/window.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2021 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.
@@ -48,7 +48,7 @@ Window Window::New(PositionSize posSize, const std::string& name, const std::str
 
   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);
 
@@ -79,9 +79,14 @@ Window::Window(const Window& copy) = default;
 
 Window& Window::operator=(const Window& rhs) = default;
 
-Window::Window(Window&& rhs) = default;
+Window::Window(Window&& rhs) noexcept = default;
 
-Window& Window::operator=(Window&& rhs) = default;
+Window& Window::operator=(Window&& rhs) noexcept = default;
+
+Window Window::DownCast(BaseHandle handle)
+{
+  return Window(dynamic_cast<Dali::Internal::Adaptor::Window*>(handle.GetObjectPtr()));
+}
 
 void Window::Add(Dali::Actor actor)
 {
@@ -108,6 +113,11 @@ Layer Window::GetRootLayer() const
   return GetImplementation(*this).GetRootLayer();
 }
 
+Layer Window::GetOverlayLayer()
+{
+  return GetImplementation(*this).GetOverlayLayer();
+}
+
 uint32_t Window::GetLayerCount() const
 {
   return GetImplementation(*this).GetLayerCount();
@@ -303,16 +313,21 @@ 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);
 }
 
-Window::WindowPosition Window::GetPosition() const
+Dali::Window::WindowPosition Window::GetPosition() const
 {
   return GetImplementation(*this).GetPosition();
 }
 
+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);