summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Blumenkrantz <zmike@osg.samsung.com>2017-10-27 08:05:14 -0400
committerMike Blumenkrantz <zmike@osg.samsung.com>2017-10-27 08:05:14 -0400
commit00836635503518b663017031a9ba1594c07072af (patch)
tree5e9c3da79e01b603f8f20608b5ba09e8baa2695b
parent394cd006a018d5977a88a7056788bc5062d87323 (diff)
-rw-r--r--src/Makefile_Ecore_Wl2.am4
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_private.h2
-rw-r--r--src/lib/ecore_wl2/ecore_wl2_window.c4
3 files changed, 8 insertions, 2 deletions
diff --git a/src/Makefile_Ecore_Wl2.am b/src/Makefile_Ecore_Wl2.am
index 7f3eb2f007..c44ae98ae3 100644
--- a/src/Makefile_Ecore_Wl2.am
+++ b/src/Makefile_Ecore_Wl2.am
@@ -20,6 +20,8 @@ lib/ecore_wl2/ecore_wl2_private.h
20nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \ 20nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \
21lib/ecore_wl2/efl-aux-hints-protocol.c \ 21lib/ecore_wl2/efl-aux-hints-protocol.c \
22lib/ecore_wl2/efl-aux-hints-client-protocol.h \ 22lib/ecore_wl2/efl-aux-hints-client-protocol.h \
23lib/ecore_wl2/efl-hints-protocol.c \
24lib/ecore_wl2/efl-hints-client-protocol.h \
23lib/ecore_wl2/teamwork-protocol.c \ 25lib/ecore_wl2/teamwork-protocol.c \
24lib/ecore_wl2/teamwork-client-protocol.h \ 26lib/ecore_wl2/teamwork-client-protocol.h \
25lib/ecore_wl2/session-recovery-client-protocol.h \ 27lib/ecore_wl2/session-recovery-client-protocol.h \
@@ -43,6 +45,8 @@ lib_ecore_wl2_libecore_wl2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
43BUILT_SOURCES += \ 45BUILT_SOURCES += \
44lib/ecore_wl2/efl-aux-hints-protocol.c \ 46lib/ecore_wl2/efl-aux-hints-protocol.c \
45lib/ecore_wl2/efl-aux-hints-client-protocol.h \ 47lib/ecore_wl2/efl-aux-hints-client-protocol.h \
48lib/ecore_wl2/efl-hints-protocol.c \
49lib/ecore_wl2/efl-hints-client-protocol.h \
46 lib/ecore_wl2/www-client-protocol.h \ 50 lib/ecore_wl2/www-client-protocol.h \
47 lib/ecore_wl2/www-protocol.c \ 51 lib/ecore_wl2/www-protocol.c \
48 lib/ecore_wl2/teamwork-protocol.c \ 52 lib/ecore_wl2/teamwork-protocol.c \
diff --git a/src/lib/ecore_wl2/ecore_wl2_private.h b/src/lib/ecore_wl2/ecore_wl2_private.h
index 1b7d26491c..afe7ccc34b 100644
--- a/src/lib/ecore_wl2/ecore_wl2_private.h
+++ b/src/lib/ecore_wl2/ecore_wl2_private.h
@@ -17,6 +17,7 @@
17 17
18# include "xdg-shell-unstable-v6-client-protocol.h" 18# include "xdg-shell-unstable-v6-client-protocol.h"
19# include "efl-aux-hints-client-protocol.h" 19# include "efl-aux-hints-client-protocol.h"
20# include "efl-hints-client-protocol.h"
20 21
21extern int _ecore_wl2_log_dom; 22extern int _ecore_wl2_log_dom;
22extern Eina_Bool no_session_recovery; 23extern Eina_Bool no_session_recovery;
@@ -95,6 +96,7 @@ struct _Ecore_Wl2_Display
95 struct www *www; 96 struct www *www;
96 struct zwp_e_session_recovery *session_recovery; 97 struct zwp_e_session_recovery *session_recovery;
97 struct efl_aux_hints *efl_aux_hints; 98 struct efl_aux_hints *efl_aux_hints;
99 struct efl_hints *efl_hints;
98 struct zwp_teamwork *teamwork; 100 struct zwp_teamwork *teamwork;
99 int compositor_version; 101 int compositor_version;
100 } wl; 102 } wl;
diff --git a/src/lib/ecore_wl2/ecore_wl2_window.c b/src/lib/ecore_wl2/ecore_wl2_window.c
index 9978e7d164..1005d9d5bd 100644
--- a/src/lib/ecore_wl2/ecore_wl2_window.c
+++ b/src/lib/ecore_wl2/ecore_wl2_window.c
@@ -271,8 +271,8 @@ static void
271_zxdg_popup_cb_configure(void *data, struct zxdg_popup_v6 *zxdg_popup EINA_UNUSED, int32_t x EINA_UNUSED, int32_t y EINA_UNUSED, int32_t width, int32_t height) 271_zxdg_popup_cb_configure(void *data, struct zxdg_popup_v6 *zxdg_popup EINA_UNUSED, int32_t x EINA_UNUSED, int32_t y EINA_UNUSED, int32_t width, int32_t height)
272{ 272{
273 Ecore_Wl2_Window *win = data; 273 Ecore_Wl2_Window *win = data;
274 win->def_config.geometry.w = width; 274 win->geometry.w = width;
275 win->def_config.geometry.h = height; 275 win->geometry.h = height;
276} 276}
277 277
278static void 278static void