From 9053bd1ae9cb7d7a5bb55ffe68a8c67955333bd5 Mon Sep 17 00:00:00 2001 From: Hannes Janetzek Date: Wed, 19 May 2010 01:34:46 +0000 Subject: [PATCH] get mouse events from seletors again SVN revision: 48995 --- src/modules/everything/evry.c | 23 ++++++++++++++--------- 1 file changed, 14 insertions(+), 9 deletions(-) diff --git a/src/modules/everything/evry.c b/src/modules/everything/evry.c index 1965fa9f4..df0e04bf0 100644 --- a/src/modules/everything/evry.c +++ b/src/modules/everything/evry.c @@ -993,15 +993,7 @@ _evry_selector_new(Evry_Window *win, int type) Plugin_Config *pc; Eina_List *l, *pcs; Evry_Selector *sel = E_NEW(Evry_Selector, 1); - Evas_Object *o = edje_object_add(win->popup->evas); - - 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, - _evry_selector_cb_up, sel); - evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, - _evry_selector_cb_wheel, sel); - evas_object_show(o); + Evas_Object *o = NULL; sel->aggregator = evry_aggregator_new(win, type); @@ -1009,15 +1001,28 @@ _evry_selector_new(Evry_Window *win, int type) { sel->actions = evry_plug_actions_new(sel, type); pcs = evry_conf->conf_subjects; + o = edje_object_part_swallow_get(win->o_main, "subject_selector"); } else if (type == EVRY_PLUGIN_ACTION) { sel->actions = evry_plug_actions_new(sel, type); pcs = evry_conf->conf_actions; + o = edje_object_part_swallow_get(win->o_main, "action_selector"); } else if (type == EVRY_PLUGIN_OBJECT) { pcs = evry_conf->conf_objects; + o = edje_object_part_swallow_get(win->o_main, "object_selector"); + } + + if (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, + _evry_selector_cb_up, sel); + evas_object_event_callback_add(o, EVAS_CALLBACK_MOUSE_WHEEL, + _evry_selector_cb_wheel, sel); } EINA_LIST_FOREACH(pcs, l, pc)