From: Seoyeon Kim Date: Tue, 2 May 2017 01:52:09 +0000 (+0900) Subject: [Tizen] keygrab & ecore-wl-window-handle c# binding X-Git-Tag: accepted/tizen/unified/20170502.165638~2 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F12%2F127812%2F1;p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git [Tizen] keygrab & ecore-wl-window-handle c# binding This reverts commit 2a01bec592db5cf4422ac41ab5474edfa4c8291d. Change-Id: I6ad1af3ef56302f0f8d5ac67ebd741bf26f671ee --- diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h old mode 100644 new mode 100755 index 0cf251b..13a2349 --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -328,6 +328,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 70ad18e..30c3d0a --- a/adaptors/devel-api/adaptor-framework/window-devel.cpp +++ b/adaptors/devel-api/adaptor-framework/window-devel.cpp @@ -55,6 +55,11 @@ bool IsVisible( Window window ) return GetImplementation( window ).IsVisible(); } +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 db6c6ac..b12c0b9 --- a/adaptors/devel-api/adaptor-framework/window-devel.h +++ b/adaptors/devel-api/adaptor-framework/window-devel.h @@ -82,6 +82,13 @@ DALI_IMPORT_API void Hide( Window window ); */ DALI_IMPORT_API bool IsVisible( 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 5c0523c..1408fab --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -676,6 +676,12 @@ void Window::RotationDone( int orientation, int width, int height ) ecore_wl_window_rotation_change_done_send( mEventHandler->mEcoreWindow ); } +void* Window::GetNativeWindowHandler() +{ + return mEventHandler->mEcoreWindow; +} + + } // Adaptor } // Internal } // Dali diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp old mode 100644 new mode 100755 index e9ec667..7b3303d --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -305,11 +305,16 @@ bool Window::IsVisible() const return mVisible; } - void Window::RotationDone( int orientation, int width, int height ) { } +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 63069b2..4f07fc6 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -811,6 +811,11 @@ void Window::RotationDone( int orientation, int width, int height ) } } +void* Window::GetNativeWindowHandler() +{ + return mEventHandler->mEcoreWindow; +} + } // Adaptor } // Internal