summaryrefslogtreecommitdiff
path: root/src/lib/ecore_evas
diff options
context:
space:
mode:
authorRafael Antognolli <rafael.antognolli@intel.com>2013-04-19 12:53:45 -0300
committerRafael Antognolli <rafael.antognolli@intel.com>2013-04-19 12:57:50 -0300
commitf12b3b94d0830b04eb1c38c6b1b7c58f5b547e55 (patch)
tree2350abc9410c691d394092b8836e0758b8da56bd /src/lib/ecore_evas
parentd1a7e1f599e22cbba3cb0d913f0ff2dbea5573bd (diff)
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.
Diffstat (limited to 'src/lib/ecore_evas')
-rw-r--r--src/lib/ecore_evas/ecore_evas_ews.c11
1 files 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
444static void 444static void
445_ecore_evas_ews_layer_set(Ecore_Evas *ee, int layer) 445_ecore_evas_ews_layer_set(Ecore_Evas *ee, int layer)
446{ 446{
447 if (layer < EVAS_LAYER_MIN + 1) 447 if (layer < EVAS_LAYER_MIN + 2)
448 layer = EVAS_LAYER_MIN + 1; 448 layer = EVAS_LAYER_MIN + 2;
449 else if (layer > EVAS_LAYER_MAX) 449 else if (layer > EVAS_LAYER_MAX)
450 layer = EVAS_LAYER_MAX; 450 layer = EVAS_LAYER_MAX;
451 451
@@ -1416,7 +1416,7 @@ ecore_evas_ews_background_set(Evas_Object *o)
1416 1416
1417 if (_ews_ee) 1417 if (_ews_ee)
1418 { 1418 {
1419 Evas_Coord w, h; 1419 Evas_Coord w, h, fw, fh;
1420 Evas *e = ecore_evas_get(_ews_ee); 1420 Evas *e = ecore_evas_get(_ews_ee);
1421 1421
1422 if (e != evas_object_evas_get(o)) 1422 if (e != evas_object_evas_get(o))
@@ -1426,9 +1426,10 @@ ecore_evas_ews_background_set(Evas_Object *o)
1426 } 1426 }
1427 1427
1428 evas_output_viewport_get(e, NULL, NULL, &w, &h); 1428 evas_output_viewport_get(e, NULL, NULL, &w, &h);
1429 evas_output_framespace_get(e, NULL, NULL, &fw, &fh);
1429 evas_object_move(o, 0, 0); 1430 evas_object_move(o, 0, 0);
1430 evas_object_resize(o, w, h); 1431 evas_object_resize(o, w - fw, h - fh);
1431 evas_object_layer_set(o, EVAS_LAYER_MIN); 1432 evas_object_layer_set(o, EVAS_LAYER_MIN + 1);
1432 evas_object_lower(o); 1433 evas_object_lower(o);
1433 evas_object_show(o); 1434 evas_object_show(o);
1434 1435