diff options
| author | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-10-27 08:05:14 -0400 |
|---|---|---|
| committer | Mike Blumenkrantz <zmike@osg.samsung.com> | 2017-10-27 08:05:14 -0400 |
| commit | 00836635503518b663017031a9ba1594c07072af (patch) | |
| tree | 5e9c3da79e01b603f8f20608b5ba09e8baa2695b | |
| parent | 394cd006a018d5977a88a7056788bc5062d87323 (diff) | |
| download | efl-devs/discomfitor/stable.tar.gz | |
stable+++devs/discomfitor/stable
| -rw-r--r-- | src/Makefile_Ecore_Wl2.am | 4 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_private.h | 2 | ||||
| -rw-r--r-- | src/lib/ecore_wl2/ecore_wl2_window.c | 4 |
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 nodist_lib_ecore_wl2_libecore_wl2_la_SOURCES = \ lib/ecore_wl2/efl-aux-hints-protocol.c \ lib/ecore_wl2/efl-aux-hints-client-protocol.h \ +lib/ecore_wl2/efl-hints-protocol.c \ +lib/ecore_wl2/efl-hints-client-protocol.h \ lib/ecore_wl2/teamwork-protocol.c \ lib/ecore_wl2/teamwork-client-protocol.h \ lib/ecore_wl2/session-recovery-client-protocol.h \ @@ -43,6 +45,8 @@ lib_ecore_wl2_libecore_wl2_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@ BUILT_SOURCES += \ lib/ecore_wl2/efl-aux-hints-protocol.c \ lib/ecore_wl2/efl-aux-hints-client-protocol.h \ +lib/ecore_wl2/efl-hints-protocol.c \ +lib/ecore_wl2/efl-hints-client-protocol.h \ lib/ecore_wl2/www-client-protocol.h \ lib/ecore_wl2/www-protocol.c \ 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 @@ # include "xdg-shell-unstable-v6-client-protocol.h" # include "efl-aux-hints-client-protocol.h" +# include "efl-hints-client-protocol.h" extern int _ecore_wl2_log_dom; extern Eina_Bool no_session_recovery; @@ -95,6 +96,7 @@ struct _Ecore_Wl2_Display struct www *www; struct zwp_e_session_recovery *session_recovery; struct efl_aux_hints *efl_aux_hints; + struct efl_hints *efl_hints; struct zwp_teamwork *teamwork; int compositor_version; } 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 _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) { Ecore_Wl2_Window *win = data; - win->def_config.geometry.w = width; - win->def_config.geometry.h = height; + win->geometry.w = width; + win->geometry.h = height; } static void |