forked from enlightenment/efl
Eo events: fix wrong event invocations
Events were still created and used on high level classes when Evas interfaces events should have been used (e.g CLICKED, SELECTED).
This commit is contained in:
parent
a2d668069c
commit
c66013a1fc
|
@ -109,7 +109,7 @@ _on_item_clicked(void *data EINA_UNUSED,
|
|||
Elm_Object_Item *eo_it = EO_OBJ(item);
|
||||
|
||||
if (item->func) item->func((void *)WIDGET_ITEM_DATA_GET(eo_it), obj2, eo_it);
|
||||
eo_do(obj2, eo_event_callback_call(ELM_HOVERSEL_EVENT_SELECTED, eo_it));
|
||||
eo_do(obj2, eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
|
||||
elm_hoversel_hover_end(obj2);
|
||||
|
||||
return EINA_TRUE;
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class Elm.Bubble (Elm.Layout)
|
||||
class Elm.Bubble (Elm.Layout, Evas.Clickable_Interface)
|
||||
{
|
||||
eo_prefix: elm_obj_bubble;
|
||||
methods {
|
||||
|
@ -44,7 +44,6 @@ class Elm.Bubble (Elm.Layout)
|
|||
Elm.Layout.sizing_eval;
|
||||
}
|
||||
events {
|
||||
clicked;
|
||||
focused;
|
||||
unfocused;
|
||||
}
|
||||
|
|
|
@ -231,7 +231,7 @@ _on_item_changed(Elm_Flipselector_Data *sd)
|
|||
if (item->func)
|
||||
item->func((void *)WIDGET_ITEM_DATA_GET(eo_item), WIDGET(item), eo_item);
|
||||
eo_do(sd->obj, eo_event_callback_call
|
||||
(ELM_FLIPSELECTOR_EVENT_SELECTED, eo_item));
|
||||
(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_item));
|
||||
}
|
||||
|
||||
static void
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
class Elm.Flipselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
|
||||
class Elm.Flipselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action,
|
||||
Evas.Selectable_Interface)
|
||||
{
|
||||
eo_prefix: elm_obj_flipselector;
|
||||
methods {
|
||||
|
@ -203,7 +204,6 @@ class Elm.Flipselector (Elm.Layout, Elm_Interface_Atspi_Widget_Action)
|
|||
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
|
||||
}
|
||||
events {
|
||||
selected;
|
||||
underflowed;
|
||||
overflowed;
|
||||
language,changed;
|
||||
|
|
|
@ -535,7 +535,7 @@ _item_unselect(Elm_Gen_Item *it)
|
|||
it->selected = EINA_FALSE;
|
||||
sd->selected = eina_list_remove(sd->selected, eo_it);
|
||||
eo_do(WIDGET(it), eo_event_callback_call
|
||||
(ELM_GENGRID_EVENT_UNSELECTED, eo_it));
|
||||
(EVAS_SELECTABLE_INTERFACE_EVENT_UNSELECTED, eo_it));
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -3978,7 +3978,7 @@ _item_select(Elm_Gen_Item *it)
|
|||
if (it->func.func) it->func.func((void *)it->func.data, WIDGET(it), eo_it);
|
||||
if (it->generation == sd->generation)
|
||||
{
|
||||
eo_do(WIDGET(it), eo_event_callback_call(ELM_GENGRID_EVENT_SELECTED, eo_it));
|
||||
eo_do(WIDGET(it), eo_event_callback_call(EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it));
|
||||
elm_object_item_focus_set(eo_it, EINA_TRUE);
|
||||
}
|
||||
|
||||
|
|
|
@ -737,8 +737,6 @@ class Elm.Gengrid (Elm.Layout, Elm_Interface_Scrollable,
|
|||
activated;
|
||||
highlighted;
|
||||
unhighlighted;
|
||||
selected;
|
||||
unselected;
|
||||
released;
|
||||
}
|
||||
|
||||
|
|
|
@ -1,4 +1,5 @@
|
|||
class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
|
||||
Evas.Clickable_Interface,
|
||||
Elm_Interface_Atspi_Widget_Action)
|
||||
{
|
||||
eo_prefix: elm_obj_hoversel;
|
||||
|
@ -152,12 +153,10 @@ class Elm.Hoversel (Elm.Button, Evas.Selectable_Interface,
|
|||
Elm_Interface_Atspi_Widget_Action.elm_actions.get;
|
||||
}
|
||||
events {
|
||||
selected;
|
||||
dismissed;
|
||||
expanded;
|
||||
item,focused;
|
||||
item,unfocused;
|
||||
clicked;
|
||||
language,changed;
|
||||
access,changed;
|
||||
}
|
||||
|
|
|
@ -471,7 +471,6 @@ class Elm.Image (Elm.Widget, Efl.File, Efl.Image, Evas.Clickable_Interface,
|
|||
}
|
||||
events {
|
||||
drop;
|
||||
clicked;
|
||||
download,start;
|
||||
download,progress;
|
||||
download,done;
|
||||
|
|
|
@ -357,7 +357,6 @@ class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface
|
|||
events {
|
||||
changed;
|
||||
delay,changed;
|
||||
selected;
|
||||
level,up;
|
||||
level,down;
|
||||
language,changed;
|
||||
|
|
|
@ -13,18 +13,6 @@ class Elm.Map_Pan (Elm_Pan)
|
|||
Elm_Pan.pos_max.get;
|
||||
}
|
||||
events {
|
||||
clicked;
|
||||
clicked,double;
|
||||
press;
|
||||
longpressed;
|
||||
scroll;
|
||||
scroll,drag,start;
|
||||
scroll,drag,stop;
|
||||
scroll,anim,start;
|
||||
scroll,anim,stop;
|
||||
zoom,start;
|
||||
zoom,stop;
|
||||
zoom,change;
|
||||
loaded;
|
||||
tile,load;
|
||||
tile,loaded;
|
||||
|
|
|
@ -13,22 +13,10 @@ class Elm.Photocam_Pan (Elm_Pan)
|
|||
Elm_Pan.pos_max.get;
|
||||
}
|
||||
events {
|
||||
clicked;
|
||||
press;
|
||||
longpressed;
|
||||
clicked,double;
|
||||
load;
|
||||
loaded;
|
||||
load,detail;
|
||||
loaded,detail;
|
||||
zoom,start;
|
||||
zoom,stop;
|
||||
zoom,change;
|
||||
scroll;
|
||||
scroll,anim,start;
|
||||
scroll,anim,stop;
|
||||
scroll,drag,start;
|
||||
scroll,drag,stop;
|
||||
download,start;
|
||||
download,progress;
|
||||
download,done;
|
||||
|
|
Loading…
Reference in New Issue