From f12b3b94d0830b04eb1c38c6b1b7c58f5b547e55 Mon Sep 17 00:00:00 2001 From: Rafael Antognolli Date: Fri, 19 Apr 2013 12:53:45 -0300 Subject: [PATCH] ecore/ews: Make this engine be aware of the wayland frame object. Its background object must be resized to the framespace, and left at least one layer available for the frame object to be under it. --- src/lib/ecore_evas/ecore_evas_ews.c | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/src/lib/ecore_evas/ecore_evas_ews.c b/src/lib/ecore_evas/ecore_evas_ews.c index ea5c983005..43ead0326b 100644 --- a/src/lib/ecore_evas/ecore_evas_ews.c +++ b/src/lib/ecore_evas/ecore_evas_ews.c @@ -444,8 +444,8 @@ _ecore_evas_ews_object_cursor_set(Ecore_Evas *ee, Evas_Object *obj, int layer, i static void _ecore_evas_ews_layer_set(Ecore_Evas *ee, int layer) { - if (layer < EVAS_LAYER_MIN + 1) - layer = EVAS_LAYER_MIN + 1; + if (layer < EVAS_LAYER_MIN + 2) + layer = EVAS_LAYER_MIN + 2; else if (layer > EVAS_LAYER_MAX) layer = EVAS_LAYER_MAX; @@ -1416,7 +1416,7 @@ ecore_evas_ews_background_set(Evas_Object *o) if (_ews_ee) { - Evas_Coord w, h; + Evas_Coord w, h, fw, fh; Evas *e = ecore_evas_get(_ews_ee); if (e != evas_object_evas_get(o)) @@ -1426,9 +1426,10 @@ ecore_evas_ews_background_set(Evas_Object *o) } evas_output_viewport_get(e, NULL, NULL, &w, &h); + evas_output_framespace_get(e, NULL, NULL, &fw, &fh); evas_object_move(o, 0, 0); - evas_object_resize(o, w, h); - evas_object_layer_set(o, EVAS_LAYER_MIN); + evas_object_resize(o, w - fw, h - fh); + evas_object_layer_set(o, EVAS_LAYER_MIN + 1); evas_object_lower(o); evas_object_show(o);