From 6fc19b8dc2c40b0a6357be81973e920d29b3525c Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Thu, 2 May 2013 07:00:49 -0300 Subject: [PATCH] ecore_evas/wayland: Only set a default framespace if we have a frame. If Ecore_Evas is requested to draw its own frame, then set the framespace too. Otherwise, keep it at 0,0 + 0x0, which means not framespace offset at all (and the window will have exactly the requested size). --- .../engines/wayland/ecore_evas_wayland_egl.c | 13 ++++++++----- .../engines/wayland/ecore_evas_wayland_shm.c | 13 ++++++++----- 2 files changed, 16 insertions(+), 10 deletions(-) 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 658c4c4cec..22b48adbc1 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 @@ -93,7 +93,7 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, Ecore_Evas_Engine_Wl_Data *wdata; Ecore_Evas *ee; int method = 0, count = 0; - int fx, fy, fw, fh; + int fx = 0, fy = 0, fw = 0, fh = 0; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -159,10 +159,13 @@ ecore_evas_wayland_egl_new_internal(const char *disp_name, unsigned int parent, ee->alpha = EINA_FALSE; /* frame offset and size */ - fx = 4; - fy = 18; - fw = 8; - fh = 22; + if (ee->prop.draw_frame) + { + fx = 4; + fy = 18; + fw = 8; + fh = 22; + } ee->evas = evas_new(); evas_data_attach_set(ee->evas, ee); 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 4556872b4e..760ad05ee2 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 @@ -91,7 +91,7 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, Ecore_Evas_Interface_Wayland *iface; Ecore_Evas *ee; int method = 0, count = 0; - int fx, fy, fw, fh; + int fx = 0, fy = 0, fw = 0, fh = 0; LOGFN(__FILE__, __LINE__, __FUNCTION__); @@ -161,10 +161,13 @@ ecore_evas_wayland_shm_new_internal(const char *disp_name, unsigned int parent, ee->can_async_render = 1; /* frame offset and size */ - fx = 4; - fy = 18; - fw = 8; - fh = 22; + if (ee->prop.draw_frame) + { + fx = 4; + fy = 18; + fw = 8; + fh = 22; + } ee->evas = evas_new(); evas_data_attach_set(ee->evas, ee);