summaryrefslogtreecommitdiff
path: root/src/modules
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 20:15:36 -0200
committerRafael Antognolli <rafael.antognolli@intel.com>2013-10-31 21:35:13 -0200
commit1deb107d56acd3e89a00d451b63920c0450e4668 (patch)
tree9b89356def8b3f72efe9ecff8f4717938bedbcb5 /src/modules
parentdd18206d860fa9cd1cea4ce01657c21678318bca (diff)
ecore/wayland: Do not store "edges" in Ecore_Wl_Window.
This is a configure event info, so put it in the right place. Some places adding edges info were also removed, which means that they were redundant. Tested with <Meta> + middle click resize, and with window border resize, on all the edges. Apparently, nothing breaks.
Diffstat (limited to 'src/modules')
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_common.c2
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_egl.c3
-rw-r--r--src/modules/ecore_evas/engines/wayland/ecore_evas_wayland_shm.c3
3 files changed, 1 insertions, 7 deletions
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 4b99563e60..901ff4e01d 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
@@ -275,7 +275,7 @@ _ecore_evas_wl_common_cb_window_configure(void *data EINA_UNUSED, int type EINA_
275 275
276 win = wdata->win; 276 win = wdata->win;
277 277
278 _ecore_evas_wayland_resize_edge_set(ee, win->edges); 278 _ecore_evas_wayland_resize_edge_set(ee, ev->edges);
279 279
280 win->server.w = win->allocation.w; 280 win->server.w = win->allocation.w;
281 win->server.h = win->allocation.h; 281 win->server.h = win->allocation.h;
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 6fd5627265..1709c50acf 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
@@ -330,9 +330,6 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
330 330
331 win = wdata->win; 331 win = wdata->win;
332 332
333 _ecore_evas_wayland_egl_resize_edge_set(ee, win->edges);
334 win->edges = 0;
335
336 win->server.w = win->allocation.w; 333 win->server.w = win->allocation.w;
337 win->server.h = win->allocation.h; 334 win->server.h = win->allocation.h;
338 ecore_wl_window_update_size(wdata->win, w, h); 335 ecore_wl_window_update_size(wdata->win, w, h);
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 9e8fc4d2c4..05060a7e3f 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
@@ -324,9 +324,6 @@ _ecore_evas_wl_resize(Ecore_Evas *ee, int w, int h)
324 324
325 win = wdata->win; 325 win = wdata->win;
326 326
327 _ecore_evas_wayland_shm_resize_edge_set(ee, win->edges);
328 win->edges = 0;
329
330 win->server.w = win->allocation.w; 327 win->server.w = win->allocation.w;
331 win->server.h = win->allocation.h; 328 win->server.h = win->allocation.h;
332 ecore_wl_window_update_size(wdata->win, w, h); 329 ecore_wl_window_update_size(wdata->win, w, h);