summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/lib/ecore_wayland/Ecore_Wayland.h2
-rw-r--r--src/lib/ecore_wayland/ecore_wl_window.c5
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c7
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c10
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c10
5 files changed, 3 insertions, 31 deletions
diff --git a/src/lib/ecore_wayland/Ecore_Wayland.h b/src/lib/ecore_wayland/Ecore_Wayland.h
index f9b70c7958..424e3db4ec 100644
--- a/src/lib/ecore_wayland/Ecore_Wayland.h
+++ b/src/lib/ecore_wayland/Ecore_Wayland.h
@@ -132,7 +132,7 @@ struct _Ecore_Wl_Window
132 struct 132 struct
133 { 133 {
134 int w, h; 134 int w, h;
135 } saved, server; 135 } saved;
136 136
137 struct 137 struct
138 { 138 {
diff --git a/src/lib/ecore_wayland/ecore_wl_window.c b/src/lib/ecore_wayland/ecore_wl_window.c
index 661e825df0..4c40a62cd9 100644
--- a/src/lib/ecore_wayland/ecore_wl_window.c
+++ b/src/lib/ecore_wayland/ecore_wl_window.c
@@ -212,8 +212,6 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
212 switch (win->buffer_type) 212 switch (win->buffer_type)
213 { 213 {
214 case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW: 214 case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_WINDOW:
215 win->server.w = win->allocation.w;
216 win->server.h = win->allocation.h;
217 break; 215 break;
218 case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_IMAGE: 216 case ECORE_WL_WINDOW_BUFFER_TYPE_EGL_IMAGE:
219 case ECORE_WL_WINDOW_BUFFER_TYPE_SHM: 217 case ECORE_WL_WINDOW_BUFFER_TYPE_SHM:
@@ -226,9 +224,6 @@ ecore_wl_window_buffer_attach(Ecore_Wl_Window *win, struct wl_buffer *buffer, in
226 wl_surface_damage(win->surface, 0, 0, 224 wl_surface_damage(win->surface, 0, 0,
227 win->allocation.w, win->allocation.h); 225 win->allocation.w, win->allocation.h);
228 wl_surface_commit(win->surface); 226 wl_surface_commit(win->surface);
229
230 win->server.w = win->allocation.w;
231 win->server.h = win->allocation.h;
232 } 227 }
233 break; 228 break;
234 default: 229 default:
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
index 2bb1aab75d..de87aff1c9 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c
@@ -277,14 +277,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
277 277
278 if (wdata->win) 278 if (wdata->win)
279 { 279 {
280 Ecore_Wl_Window *win;
281
282 win = wdata->win;
283
284 _ecore_evas_wayland_resize_edge_set(ee, ev->edges); 280 _ecore_evas_wayland_resize_edge_set(ee, ev->edges);
285
286 win->server.w = win->allocation.w;
287 win->server.h = win->allocation.h;
288 ecore_wl_window_update_size(wdata->win, ev->w, ev->h); 281 ecore_wl_window_update_size(wdata->win, ev->w, ev->h);
289 } 282 }
290 } 283 }
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
index 1709c50acf..e0bb74319d 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c
@@ -325,15 +325,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
325 evas_object_resize(wdata->frame, w, h); 325 evas_object_resize(wdata->frame, w, h);
326 326
327 if (wdata->win) 327 if (wdata->win)
328 { 328 ecore_wl_window_update_size(wdata->win, w, h);
329 Ecore_Wl_Window *win;
330
331 win = wdata->win;
332
333 win->server.w = win->allocation.w;
334 win->server.h = win->allocation.h;
335 ecore_wl_window_update_size(wdata->win, w, h);
336 }
337 329
338 if (ee->func.fn_resize) ee->func.fn_resize(ee); 330 if (ee->func.fn_resize) ee->func.fn_resize(ee);
339 } 331 }
diff --git a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
index 05060a7e3f..55421736d4 100644
--- a/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
+++ b/src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c
@@ -319,15 +319,7 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
319 evas_object_resize(wdata->frame, w, h); 319 evas_object_resize(wdata->frame, w, h);
320 320
321 if (wdata->win) 321 if (wdata->win)
322 { 322 ecore_wl_window_update_size(wdata->win, w, h);
323 Ecore_Wl_Window *win;
324
325 win = wdata->win;
326
327 win->server.w = win->allocation.w;
328 win->server.h = win->allocation.h;
329 ecore_wl_window_update_size(wdata->win, w, h);
330 }
331 323
332 if (ee->func.fn_resize) ee->func.fn_resize(ee); 324 if (ee->func.fn_resize) ee->func.fn_resize(ee);
333 } 325 }