aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Blumenkrantz <m.blumenkran@samsung.com>2013-02-20 10:52:56 +0000
committerMike Blumenkrantz <m.blumenkran@samsung.com>2013-02-22 13:18:30 +0000
commit4b9113f3bae84f3d1f73be460b41259c52c96882 (patch)
treef23eea68cc905264547c44a52f02d4fe0f756ed3
parent159373a340b888ce4cdf9985010b90b0b64c237c (diff)
downloadenlightenment-4b9113f3bae84f3d1f73be460b41259c52c96882.tar.gz
enlightenment-4b9113f3bae84f3d1f73be460b41259c52c96882.tar.xz
enlightenment-4b9113f3bae84f3d1f73be460b41259c52c96882.zip
use new comp layer functions to correctly set layer for gadget mover objects...this needs to be redone entirely along with the rest of gadcon
-rw-r--r--src/bin/e_gadcon.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/src/bin/e_gadcon.c b/src/bin/e_gadcon.c
index d90063ba1..37ea36b22 100644
--- a/src/bin/e_gadcon.c
+++ b/src/bin/e_gadcon.c
@@ -1122,6 +1122,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
{
Evas_Coord x, y, w, h;
Evas_Object *base;
+ unsigned int layer;
E_OBJECT_CHECK(gcc);
E_OBJECT_TYPE_CHECK(gcc, E_GADCON_CLIENT_TYPE);
@@ -1132,7 +1133,9 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
evas_object_geometry_get(base, &x, &y, &w, &h);
gcc->o_control = edje_object_add(gcc->gadcon->evas);
- evas_object_layer_set(gcc->o_control, evas_object_layer_get(base) + 1);
+ /* FIXME: should probably be in gadget theme or something */
+ layer = e_comp_e_object_layer_effective_get(E_OBJECT(gcc)) + 1;
+ evas_object_layer_set(gcc->o_control, layer);
e_gadcon_locked_set(gcc->gadcon, 1);
gcc->gadcon->editing = 1;
@@ -1158,7 +1161,7 @@ e_gadcon_client_edit_begin(E_Gadcon_Client *gcc)
gcc->o_event = evas_object_rectangle_add(gcc->gadcon->evas);
evas_object_color_set(gcc->o_event, 0, 0, 0, 0);
evas_object_repeat_events_set(gcc->o_event, 1);
- evas_object_layer_set(gcc->o_event, evas_object_layer_get(base) + 1);
+ evas_object_layer_set(gcc->o_event, layer);
evas_object_move(gcc->o_event, x, y);
evas_object_resize(gcc->o_event, w, h);