enlightenment/enlightenment
enlightenment
/
enlightenment
10
9
Fork 12
Code Issues 24 Pull Requests 2 Projects Releases Wiki Activity

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.
This commit is contained in:
Marcel Hollerbach 2017-08-13 21:02:42 +02:00 committed by Mike Blumenkrantz
parent 70a33bcbe9
commit b1a64b290f
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/modules/everything/e_mod_main.h
View File

@ -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;

12
src/modules/everything/evry.c
View File

@ -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);
}