From: Heeyong Song <heeyong.song@samsung.com>
Date: Tue, 20 Jun 2017 06:55:54 +0000 (+0900)
Subject: Revert "[Tizen] remove GetNativeWindowHandler() in devel window"
X-Git-Tag: submit/tizen/20170621.112620~25
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=1d42e4a6d6b79d947036620513953539c90e0133;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git

Revert "[Tizen] remove GetNativeWindowHandler() in devel window"

This reverts commit 49a3b1f2bfb00e20f162663384ab8b12e69d8a20.

Change-Id: Iaedb9184713dc38997f0153ff84746625cf269f2
---

diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h
old mode 100644
new mode 100755
index 09a754113..d7442b359
--- a/adaptors/common/window-impl.h
+++ b/adaptors/common/window-impl.h
@@ -417,6 +417,10 @@ private:
   IndicatorSignalType mIndicatorVisibilityChangedSignal;
   FocusSignalType     mFocusChangedSignal;
   SignalType          mDeleteRequestSignal;
+
+public:
+
+  void* GetNativeWindowHandler();
 };
 
 } // namespace Adaptor
diff --git a/adaptors/devel-api/adaptor-framework/window-devel.cpp b/adaptors/devel-api/adaptor-framework/window-devel.cpp
old mode 100644
new mode 100755
index b6f977c06..eb830fd4d
--- a/adaptors/devel-api/adaptor-framework/window-devel.cpp
+++ b/adaptors/devel-api/adaptor-framework/window-devel.cpp
@@ -145,6 +145,11 @@ int GetBrightness( Window window )
   return GetImplementation( window ).GetBrightness();
 }
 
+void * GetNativeWindowHandler( Window window )
+{
+  return GetImplementation( window ).GetNativeWindowHandler();
+}
+
 } // namespace DevelWindow
 
 } // namespace Dali
diff --git a/adaptors/devel-api/adaptor-framework/window-devel.h b/adaptors/devel-api/adaptor-framework/window-devel.h
old mode 100644
new mode 100755
index 6d07c7134..c8a4a26ee
--- a/adaptors/devel-api/adaptor-framework/window-devel.h
+++ b/adaptors/devel-api/adaptor-framework/window-devel.h
@@ -293,6 +293,13 @@ DALI_IMPORT_API bool SetBrightness( Window window, int brightness );
  */
 DALI_IMPORT_API int GetBrightness( Window window );
 
+/**
+ * @brief Returns native Ecore Wayland Window handle only for c# binding
+ * @param[in] window The window where Ecore Wayland window handle is extracted
+ * @return void * of native Ecore Wayland Window
+ */
+DALI_IMPORT_API void * GetNativeWindowHandler( Window window );
+
 } // namespace DevelWindow
 
 } // namespace Dali
diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
old mode 100644
new mode 100755
index d0dbdb7c9..f300e7740
--- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
+++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+* Copyright (c) 2017 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.
@@ -1410,6 +1410,11 @@ int Window::GetBrightness()
   return mEventHandler->mBrightness;
 }
 
+void* Window::GetNativeWindowHandler()
+{
+  return mEventHandler->mEcoreWindow;
+}
+
 } // Adaptor
 
 } // Internal
diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp
old mode 100644
new mode 100755
index 631681fe0..da26dafcd
--- a/adaptors/wayland/window-impl-wl.cpp
+++ b/adaptors/wayland/window-impl-wl.cpp
@@ -309,7 +309,6 @@ bool Window::IsVisible() const
   return mVisible;
 }
 
-
 void Window::RotationDone( int orientation, int width, int height )
 {
 }
@@ -403,6 +402,11 @@ int Window::GetBrightness()
   return 0;
 }
 
+void* Window::GetNativeWindowHandler()
+{
+  return NULL;
+}
+
 } // Adaptor
 } // Internal
 } // Dali
diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp
old mode 100644
new mode 100755
index 710d9fbdb..c8ce7a6db
--- a/adaptors/x11/window-impl-x.cpp
+++ b/adaptors/x11/window-impl-x.cpp
@@ -907,6 +907,11 @@ int Window::GetBrightness()
   return 0;
 }
 
+void* Window::GetNativeWindowHandler()
+{
+  return &(mEventHandler->mEcoreWindow);
+}
+
 } // Adaptor
 
 } // Internal