From f245fd24bc9a014b078b387b2287a062e986a7f7 Mon Sep 17 00:00:00 2001 From: Avi Levin Date: Wed, 13 May 2015 15:49:40 +0300 Subject: [PATCH] elm_spinner, elm_index: porting evas smart callbacks to eo --- legacy/elementary/src/lib/elm_index.c | 30 ++++---- legacy/elementary/src/lib/elm_index.eo | 2 +- legacy/elementary/src/lib/elm_spinner.c | 92 +++++++++++++++---------- 3 files changed, 73 insertions(+), 51 deletions(-) diff --git a/legacy/elementary/src/lib/elm_index.c b/legacy/elementary/src/lib/elm_index.c index 6195ff57b1..272fd8cfa6 100644 --- a/legacy/elementary/src/lib/elm_index.c +++ b/legacy/elementary/src/lib/elm_index.c @@ -509,7 +509,8 @@ _delay_change_cb(void *data) sd->delay = NULL; item = elm_index_selected_item_get(data, sd->level); - if (item) evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, item); + if (item) eo_do(data, eo_event_callback_call + (ELM_INDEX_EVENT_DELAY_CHANGED, item)); return ECORE_CALLBACK_CANCEL; } @@ -667,12 +668,12 @@ _sel_eval(Evas_Object *obj, _elm_access_say(ret); } - if (om_closest) - evas_object_smart_callback_call - (obj, SIG_CHANGED, EO_OBJ(om_closest)); + if (om_closest) + eo_do(obj, eo_event_callback_call + (ELM_INDEX_EVENT_CHANGED, EO_OBJ(om_closest))); else - evas_object_smart_callback_call - (obj, SIG_CHANGED, EO_OBJ(it)); + eo_do(obj, eo_event_callback_call + (ELM_INDEX_EVENT_CHANGED, EO_OBJ(it))); ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(sd->delay_change_time, _delay_change_cb, obj); @@ -763,7 +764,8 @@ _on_mouse_up(void *data, eo_item = elm_index_selected_item_get(data, sd->level); if (eo_item) { - evas_object_smart_callback_call(data, SIG_SELECTED, eo_item); + eo_do(data, eo_event_callback_call + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, eo_item)); eo_id_item = eo_item; ELM_INDEX_ITEM_DATA_GET(eo_id_item, id_item); if (id_item->func) @@ -811,7 +813,8 @@ _on_mouse_move(void *data, sd->level = 1; snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level); elm_layout_signal_emit(data, buf, "elm"); - evas_object_smart_callback_call(data, SIG_LEVEL_UP, NULL); + eo_do(data, eo_event_callback_call + (ELM_INDEX_EVENT_LEVEL_UP, NULL)); } } else @@ -821,7 +824,8 @@ _on_mouse_move(void *data, sd->level = 0; snprintf(buf, sizeof(buf), "elm,state,level,%i", sd->level); elm_layout_signal_emit(data, buf, "elm"); - evas_object_smart_callback_call(data, SIG_LEVEL_DOWN, NULL); + eo_do(data, eo_event_callback_call + (ELM_INDEX_EVENT_LEVEL_DOWN, NULL)); } } } @@ -1216,10 +1220,10 @@ _elm_index_item_selected_set(Eo *eo_it, edje_object_signal_emit(VIEW(it_active), "elm,state,active", "elm"); edje_object_message_signal_process(VIEW(it_active)); - evas_object_smart_callback_call - (obj, SIG_CHANGED, eo_it); - evas_object_smart_callback_call - (obj, SIG_SELECTED, eo_it); + eo_do(obj, eo_event_callback_call + (ELM_INDEX_EVENT_CHANGED, eo_it)); + eo_do(obj, eo_event_callback_call + (EVAS_SELECTABLE_INTERFACE_EVENT_SELECTED, eo_it)); ecore_timer_del(sd->delay); sd->delay = ecore_timer_add(sd->delay_change_time, _delay_change_cb, obj); diff --git a/legacy/elementary/src/lib/elm_index.eo b/legacy/elementary/src/lib/elm_index.eo index 218bfdb531..ed3eba64bd 100644 --- a/legacy/elementary/src/lib/elm_index.eo +++ b/legacy/elementary/src/lib/elm_index.eo @@ -1,4 +1,4 @@ -class Elm.Index (Elm.Layout) +class Elm.Index (Elm.Layout, Evas.Clickable_Interface, Evas.Selectable_Interface) { eo_prefix: elm_obj_index; methods { diff --git a/legacy/elementary/src/lib/elm_spinner.c b/legacy/elementary/src/lib/elm_spinner.c index 654e1a67ab..42ff096f29 100644 --- a/legacy/elementary/src/lib/elm_spinner.c +++ b/legacy/elementary/src/lib/elm_spinner.c @@ -132,7 +132,7 @@ _delay_change_timer_cb(void *data) ELM_SPINNER_DATA_GET(data, sd); sd->delay_change_timer = NULL; - evas_object_smart_callback_call(data, SIG_DELAY_CHANGED, NULL); + eo_do(data, eo_event_callback_call(ELM_SPINNER_EVENT_DELAY_CHANGED, NULL)); return ECORE_CALLBACK_CANCEL; } @@ -165,7 +165,7 @@ _value_set(Evas_Object *obj, if (new_val == sd->val) return EINA_FALSE; sd->val = new_val; - evas_object_smart_callback_call(obj, SIG_CHANGED, NULL); + eo_do(obj, eo_event_callback_call(ELM_SPINNER_EVENT_CHANGED, NULL)); elm_interface_atspi_accessible_value_changed_signal_emit(obj); ecore_timer_del(sd->delay_change_timer); sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME, @@ -243,7 +243,8 @@ _drag_start_cb(void *data, sd->drag_prev_pos = 0; sd->drag_val_step = 1; - evas_object_smart_callback_call(obj, SIG_DRAG_START, NULL); + eo_do(obj, eo_event_callback_call + (ELM_SPINNER_EVENT_SPINNER_DRAG_START, NULL)); } static void @@ -260,7 +261,8 @@ _drag_stop_cb(void *data, edje_object_part_drag_value_set (wd->resize_obj, "elm.dragable.slider", 0.0, 0.0); - evas_object_smart_callback_call(obj, SIG_DRAG_STOP, NULL); + eo_do(obj, eo_event_callback_call + (ELM_SPINNER_EVENT_SPINNER_DRAG_STOP, NULL)); } static void @@ -297,18 +299,20 @@ _entry_value_apply(Evas_Object *obj) elm_spinner_value_set(obj, val); } -static void +static Eina_Bool _entry_activated_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); _entry_value_apply(data); - evas_object_smart_callback_call(data, SIG_CHANGED, NULL); + eo_do(data, eo_event_callback_call(ELM_SPINNER_EVENT_CHANGED, NULL)); ecore_timer_del(sd->delay_change_timer); sd->delay_change_timer = ecore_timer_add(ELM_SPINNER_DELAY_CHANGE_TIME, _delay_change_timer_cb, data); + + return EINA_TRUE; } static void @@ -353,8 +357,8 @@ _toggle_entry(Evas_Object *obj) (sd->ent, EVAS_CALLBACK_SHOW, _entry_show_cb, obj); } elm_entry_single_line_set(sd->ent, EINA_TRUE); - evas_object_smart_callback_add - (sd->ent, "activated", _entry_activated_cb, obj); + eo_do(sd->ent, eo_event_callback_add + (ELM_ENTRY_EVENT_ACTIVATED, _entry_activated_cb, obj)); elm_layout_content_set(obj, "elm.swallow.entry", sd->ent); } if (!sd->button_layout) @@ -587,9 +591,9 @@ _button_dec_stop_cb(void *data, _spin_stop(data); } -static void +static Eina_Bool _inc_button_clicked_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -601,11 +605,13 @@ _inc_button_clicked_cb(void *data, if (sd->entry_visible) _entry_value_apply(data); if (_elm_config->access_mode) _access_increment_decrement_info_say(data, EINA_TRUE); + + return EINA_TRUE; } -static void +static Eina_Bool _inc_button_pressed_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -616,11 +622,13 @@ _inc_button_pressed_cb(void *data, _val_inc_start, data); if (sd->entry_visible) _entry_value_apply(data); + + return EINA_TRUE; } -static void +static Eina_Bool _inc_button_unpressed_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -631,19 +639,23 @@ _inc_button_unpressed_cb(void *data, sd->longpress_timer = NULL; } _spin_stop(data); + + return EINA_TRUE; } -static void +static Eina_Bool _text_button_clicked_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { _toggle_entry(data); + + return EINA_TRUE; } -static void +static Eina_Bool _dec_button_clicked_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -656,11 +668,13 @@ _dec_button_clicked_cb(void *data, if (_elm_config->access_mode) _access_increment_decrement_info_say(data, EINA_FALSE); + + return EINA_TRUE; } -static void +static Eina_Bool _dec_button_pressed_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -671,11 +685,13 @@ _dec_button_pressed_cb(void *data, _val_dec_start, data); if (sd->entry_visible) _entry_value_apply(data); + + return EINA_TRUE; } -static void +static Eina_Bool _dec_button_unpressed_cb(void *data, - Evas_Object *obj EINA_UNUSED, + Eo *obj EINA_UNUSED, const Eo_Event_Description *desc EINA_UNUSED, void *event_info EINA_UNUSED) { ELM_SPINNER_DATA_GET(data, sd); @@ -686,6 +702,8 @@ _dec_button_unpressed_cb(void *data, sd->longpress_timer = NULL; } _spin_stop(data); + + return EINA_TRUE; } EOLIAN static void @@ -968,12 +986,12 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) priv->inc_button = elm_button_add(obj); elm_object_style_set(priv->inc_button, "spinner/increase/default"); - evas_object_smart_callback_add - (priv->inc_button, "clicked", _inc_button_clicked_cb, obj); - evas_object_smart_callback_add - (priv->inc_button, "pressed", _inc_button_pressed_cb, obj); - evas_object_smart_callback_add - (priv->inc_button, "unpressed", _inc_button_unpressed_cb, obj); + eo_do(priv->inc_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _inc_button_clicked_cb, obj)); + eo_do(priv->inc_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, _inc_button_pressed_cb, obj)); + eo_do(priv->inc_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, _inc_button_unpressed_cb, obj)); elm_layout_content_set(obj, "elm.swallow.inc_button", priv->inc_button); elm_widget_sub_object_add(obj, priv->inc_button); @@ -981,8 +999,8 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) priv->text_button = elm_button_add(obj); elm_object_style_set(priv->text_button, "spinner/default"); - evas_object_smart_callback_add - (priv->text_button, "clicked", _text_button_clicked_cb, obj); + eo_do(priv->text_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _text_button_clicked_cb, obj)); elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button); elm_widget_sub_object_add(obj, priv->text_button); @@ -990,12 +1008,12 @@ _elm_spinner_evas_object_smart_add(Eo *obj, Elm_Spinner_Data *priv) priv->dec_button = elm_button_add(obj); elm_object_style_set(priv->dec_button, "spinner/decrease/default"); - evas_object_smart_callback_add - (priv->dec_button, "clicked", _dec_button_clicked_cb, obj); - evas_object_smart_callback_add - (priv->dec_button, "pressed", _dec_button_pressed_cb, obj); - evas_object_smart_callback_add - (priv->dec_button, "unpressed", _dec_button_unpressed_cb, obj); + eo_do(priv->dec_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_CLICKED, _dec_button_clicked_cb, obj)); + eo_do(priv->dec_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_PRESSED, _dec_button_pressed_cb, obj)); + eo_do(priv->dec_button, eo_event_callback_add + (EVAS_CLICKABLE_INTERFACE_EVENT_UNPRESSED, _dec_button_unpressed_cb, obj)); elm_layout_content_set(obj, "elm.swallow.dec_button", priv->dec_button); elm_widget_sub_object_add(obj, priv->dec_button);