summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAvi Levin <avi.levin@samsung.com>2015-05-13 16:46:41 +0300
committerAvi Levin <avi.levin@samsung.com>2015-06-29 17:03:33 +0300
commit4376527991b95afb462a63213c4f1cc483b43ece (patch)
tree5554670621711e323e8cee7e389dcdf3e3823c87
parent268b440ff876278b0beaa59d3f5da88a60682e29 (diff)
elm_layout, elm_label: porting evas smart callbacks to eo
-rw-r--r--src/lib/elm_label.c2
-rw-r--r--src/lib/elm_layout.c7
2 files changed, 5 insertions, 4 deletions
diff --git a/src/lib/elm_label.c b/src/lib/elm_label.c
index 4ef320a39..33429f86e 100644
--- a/src/lib/elm_label.c
+++ b/src/lib/elm_label.c
@@ -359,7 +359,7 @@ _on_slide_end(void *data, Evas_Object *obj EINA_UNUSED,
359 if (sd->slide_ellipsis) 359 if (sd->slide_ellipsis)
360 eo_do(data, elm_obj_label_ellipsis_set(EINA_TRUE)); 360 eo_do(data, elm_obj_label_ellipsis_set(EINA_TRUE));
361 361
362 evas_object_smart_callback_call(data, SIG_SLIDE_END, NULL); 362 eo_do(data, eo_event_callback_call(ELM_LABEL_EVENT_SLIDE_END, NULL));
363} 363}
364 364
365EOLIAN static void 365EOLIAN static void
diff --git a/src/lib/elm_layout.c b/src/lib/elm_layout.c
index e85efd605..90bbc9040 100644
--- a/src/lib/elm_layout.c
+++ b/src/lib/elm_layout.c
@@ -367,7 +367,7 @@ _elm_layout_theme_internal(Eo *obj, Elm_Layout_Smart_Data *sd)
367 } 367 }
368 368
369 if (ret) 369 if (ret)
370 evas_object_smart_callback_call(obj, SIG_THEME_CHANGED, NULL); 370 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_THEME_CHANGED, NULL));
371 371
372 ret = _visuals_refresh(obj, sd) && ret; 372 ret = _visuals_refresh(obj, sd) && ret;
373 373
@@ -409,7 +409,7 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
409 { 409 {
410 elm_layout_signal_emit(obj, "elm,action,focus", "elm"); 410 elm_layout_signal_emit(obj, "elm,action,focus", "elm");
411 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 411 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
412 evas_object_smart_callback_call(obj, SIG_LAYOUT_FOCUSED, NULL); 412 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_FOCUSED, NULL));
413 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 413 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
414 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE); 414 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_TRUE);
415 } 415 }
@@ -417,9 +417,10 @@ _elm_layout_elm_widget_on_focus(Eo *obj, Elm_Layout_Smart_Data *_pd EINA_UNUSED)
417 { 417 {
418 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm"); 418 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
419 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 419 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
420 evas_object_smart_callback_call(obj, SIG_LAYOUT_UNFOCUSED, NULL); 420 eo_do(obj, eo_event_callback_call(ELM_LAYOUT_EVENT_UNFOCUSED, NULL));
421 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 421 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
422 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE); 422 elm_interface_atspi_accessible_state_changed_signal_emit(obj, ELM_ATSPI_STATE_FOCUSED, EINA_FALSE);
423
423 } 424 }
424 edje_object_message_signal_process(wd->resize_obj); 425 edje_object_message_signal_process(wd->resize_obj);
425 426