projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
[Tizen] Support Ecore-Wayland2
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
adaptor
/
tizen
/
adaptor-impl-tizen.cpp
diff --git
a/dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp
b/dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp
index
35dbcea
..
e9c44e4
100644
(file)
--- a/
dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp
+++ b/
dali/internal/adaptor/tizen/adaptor-impl-tizen.cpp
@@
-20,12
+20,18
@@
// EXTERNAL INCLUDES
#include <app_common.h>
// EXTERNAL INCLUDES
#include <app_common.h>
+#include <system_settings.h>
+
#ifdef APPCORE_WATCH_AVAILABLE
#include <screen_connector_provider.h>
#ifdef APPCORE_WATCH_AVAILABLE
#include <screen_connector_provider.h>
-#include <dali/integration-api/wayland/ecore-wl-render-surface.h>
#endif
#endif
-#include <system_settings.h>
+#ifdef ECORE_WAYLAND2
+#include <Ecore_Wl2.h>
+#else
+#include <Ecore_Wayland.h>
+#endif
+
namespace Dali
{
namespace Dali
{
@@
-106,8
+112,13
@@
void Adaptor::SurfaceInitialized()
// Use strdup() in app_get_id(), so need to free memory
if( appId )
{
// Use strdup() in app_get_id(), so need to free memory
if( appId )
{
+#ifdef ECORE_WAYLAND2
+ Ecore_Wl2_Window* ecoreWlWindow = AnyCast<Ecore_Wl2_Window*>( mNativeWindow );
+ screen_connector_provider_remote_enable( appId, ecore_wl2_window_surface_get( ecoreWlWindow ) );
+#else
Ecore_Wl_Window* ecoreWlWindow = AnyCast<Ecore_Wl_Window*>( mNativeWindow );
Ecore_Wl_Window* ecoreWlWindow = AnyCast<Ecore_Wl_Window*>( mNativeWindow );
- screen_connector_provider_remote_enable(appId, ecore_wl_window_surface_get(ecoreWlWindow));
+ screen_connector_provider_remote_enable( appId, ecore_wl_window_surface_get( ecoreWlWindow ) );
+#endif
free( appId );
}
#endif
free( appId );
}
#endif