diff options
| author | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-08-13 21:02:42 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <marcel-hollerbach@t-online.de> | 2017-08-13 21:18:49 +0200 |
| commit | 430d7e0bb225e0e85bce179f3a899b4b7622580b (patch) | |
| tree | c7654b9a8f11c9704cc03bbffe8a05bd2b42ad7e | |
| parent | ac0e78201e2c7c11e36dc483f5f247e5b0d15064 (diff) | |
| download | enlightenment-430d7e0bb225e0e85bce179f3a899b4b7622580b.tar.gz | |
everything: use correct edje api
everything used here edje_object_part_swallow_get, which is somehow
wrong, since we dont really know if the everything theme gives the type
swallow, using the plain object_get of edje is the solution here. Its
returning a alias object that is hiding the internal edje object.
| -rw-r--r-- | src/modules/everything/e_mod_main.h | 1 | ||||
| -rw-r--r-- | src/modules/everything/evry.c | 12 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/modules/everything/e_mod_main.h b/src/modules/everything/e_mod_main.h index e36099aec0..47fd345b02 100644 --- a/src/modules/everything/e_mod_main.h +++ b/src/modules/everything/e_mod_main.h @@ -81,6 +81,7 @@ struct _Evry_Selector Evas_Object *o_icon; Evas_Object *o_thumb; + Evas_Object *event_object; Eina_Bool do_thumb; Ecore_Timer *update_timer; diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 6050340fe8..c359af08c1 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -1135,8 +1135,9 @@ _evry_selector_new(Evry_Window *win, int type) sel->edje_part = "object_selector"; } - if ((o = edje_object_part_swallow_get(win->o_main, sel->edje_part))) + if ((o = edje_object_part_object_get(win->o_main, sel->edje_part))) { + sel->event_object = o; evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_DOWN, _evry_selector_cb_down, sel); evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_UP, @@ -1162,15 +1163,14 @@ static void _evry_selector_free(Evry_Selector *sel) { Evry_Window *win = sel->win; - Evas_Object *o; - if ((o = edje_object_part_swallow_get(win->o_main, sel->edje_part))) + if (sel->event_object) { - evas_object_event_callback_del_full(o, EVAS_CALLBACK_MOUSE_DOWN, + evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_DOWN, _evry_selector_cb_down, sel); - evas_object_event_callback_del_full(o, EVAS_CALLBACK_MOUSE_UP, + evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_UP, _evry_selector_cb_up, sel); - evas_object_event_callback_del_full(o, EVAS_CALLBACK_MOUSE_WHEEL, + evas_object_event_callback_del_full(sel->event_object, EVAS_CALLBACK_MOUSE_WHEEL, _evry_selector_cb_wheel, sel); } |