fix signals for check, frame, image_zoomable, layout.devs/ami/theme-signal-renaming

signals for both efl_ui and legacy should be supported.

4 files changed, 306 insertions, 121 deletions

diff --git a/src/lib/elementary/efl_ui_check.c b/src/lib/elementary/efl_ui_check.c
index d996365d2c..b8776dbce2 100644
--- a/src/lib/elementary/efl_ui_check.c
+++ b/src/lib/elementary/efl_ui_check.c
@@ -60,8 +60,16 @@ _activate(Evas_Object *obj)
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "state,check,on" signal emission when we can break ABI.
-        elm_layout_signal_emit(obj, "activate,check,on", "efl");
-        elm_layout_signal_emit(obj, "state,check,on", "efl");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
+             elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+          }
+        else
+          {
+             elm_layout_signal_emit(obj, "activate,check,on", "efl");
+             elm_layout_signal_emit(obj, "state,check,on", "efl");
+          }
         if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
              _elm_access_say(E_("State: On"));
      }
@@ -71,8 +79,16 @@ _activate(Evas_Object *obj)
         // so that we can distinguish between state change by user or state change
         // by calling state_change() api. Keep both the signal for backward compatibility
         // and remove "state,check,off" signal emission when we can break ABI.
-        elm_layout_signal_emit(obj, "activate,check,off", "efl");
-        elm_layout_signal_emit(obj, "state,check,off", "efl");
+        if (elm_widget_is_legacy(obj))
+          {
+             elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
+             elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
+        else
+          {
+             elm_layout_signal_emit(obj, "activate,check,off", "efl");
+             elm_layout_signal_emit(obj, "state,check,off", "efl");
+          }
         if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
              _elm_access_say(E_("State: Off"));
      }
@@ -127,10 +143,20 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
 
    if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
 
-   if (efl_ui_nstate_value_get(obj) == 0)
-     elm_layout_signal_emit(obj, "state,check,off", "efl");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (efl_ui_nstate_value_get(obj) == 0)
+          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+     }
    else
-     elm_layout_signal_emit(obj, "state,check,on", "efl");
+     {
+        if (efl_ui_nstate_value_get(obj) == 0)
+          elm_layout_signal_emit(obj, "state,check,off", "efl");
+        else
+          elm_layout_signal_emit(obj, "state,check,on", "efl");
+     }
 
    edje_object_message_signal_process(wd->resize_obj);
 
@@ -195,7 +221,10 @@ _on_check_off(void *data,
    EFL_UI_CHECK_DATA_GET(obj, sd);
 
    if (sd->statep) *sd->statep = 0;
-   elm_layout_signal_emit(obj, "state,check,off", "efl");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+   else
+     elm_layout_signal_emit(obj, "state,check,off", "efl");
    efl_ui_nstate_value_set(obj, 0);
 
    if (_elm_config->atspi_mode)
@@ -215,7 +244,10 @@ _on_check_on(void *data,
    EFL_UI_CHECK_DATA_GET(obj, sd);
 
    if (sd->statep) *sd->statep = 1;
-   elm_layout_signal_emit(obj, "state,check,on", "efl");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+   else
+     elm_layout_signal_emit(obj, "state,check,on", "efl");
    efl_ui_nstate_value_set(obj, 1);
 
    if (_elm_config->atspi_mode)
@@ -246,10 +278,21 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value)
 
    if (sd->statep) *sd->statep = value;
 
-   if (value == 1)
-     elm_layout_signal_emit(obj, "state,check,on", "efl");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (value == 1)
+          elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+        else
+          elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+
+     }
    else
-     elm_layout_signal_emit(obj, "state,check,off", "efl");
+     {
+        if (value == 1)
+          elm_layout_signal_emit(obj, "state,check,on", "efl");
+        else
+          elm_layout_signal_emit(obj, "state,check,off", "efl");
+     }
 
    edje_object_message_signal_process(wd->resize_obj);
 
@@ -280,12 +323,24 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
    evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
 
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "action,check,on", "*", _on_check_on, obj);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "action,check,off", "*", _on_check_off, obj);
-   efl_layout_signal_callback_add
-     (wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj);
+   if (elm_widget_is_legacy(obj))
+     {
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
+     }
+   else
+     {
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "action,check,on", "*", _on_check_on, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "action,check,off", "*", _on_check_off, obj);
+        efl_layout_signal_callback_add
+           (wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj);
+     }
 
    efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
    _elm_access_object_register(obj, wd->resize_obj);
@@ -313,10 +368,20 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
         nd->state = state;
         if (sd->statep) *sd->statep = state;
 
-        if (state == 1)
-          elm_layout_signal_emit(obj, "state,check,on", "efl");
+        if (elm_widget_is_legacy(obj))
+          {
+             if (state == 1)
+               elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+             else
+               elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
         else
-          elm_layout_signal_emit(obj, "state,check,off", "efl");
+          {
+             if (state == 1)
+               elm_layout_signal_emit(obj, "state,check,on", "efl");
+             else
+               elm_layout_signal_emit(obj, "state,check,off", "efl");
+          }
         edje_object_message_signal_process(wd->resize_obj);
      }
 }
@@ -343,10 +408,20 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
    if (*sd->statep != nd->state)
      {
         nd->state = *sd->statep;
-        if (nd->state == 1)
-          elm_layout_signal_emit(obj, "state,check,on", "efl");
+        if (elm_widget_is_legacy(obj))
+          {
+             if (nd->state == 1)
+               elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
+             else
+               elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
+          }
         else
-          elm_layout_signal_emit(obj, "state,check,off", "efl");
+          {
+             if (nd->state == 1)
+               elm_layout_signal_emit(obj, "state,check,on", "efl");
+             else
+               elm_layout_signal_emit(obj, "state,check,off", "efl");
+          }
      }
 }
 
@@ -402,10 +477,18 @@ _icon_signal_emit(Evas_Object *obj)
    char buf[64];
 
    if (!elm_widget_resize_object_get(obj)) return;
-   snprintf(buf, sizeof(buf), "state,icon,%s",
-            elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
-
-   elm_layout_signal_emit(obj, buf, "efl");
+   if (elm_widget_is_legacy(obj))
+     {
+        snprintf(buf, sizeof(buf), "elm,state,icon,%s",
+                 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
+        elm_layout_signal_emit(obj, buf, "elm");
+     }
+   else
+     {
+        snprintf(buf, sizeof(buf), "state,icon,%s",
+                 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
+        elm_layout_signal_emit(obj, buf, "efl");
+     }
    edje_object_message_signal_process(wd->resize_obj);
 
    elm_layout_sizing_eval(obj);
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index 82e5acdbea..17c4beb776 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -82,7 +82,10 @@ _on_frame_clicked(void *data,
    if (sd->collapsible)
      {
         efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
-        elm_layout_signal_emit(data, "action,toggle", "efl");
+        if (elm_widget_is_legacy(data))
+          elm_layout_signal_emit(data, "elm,action,toggle", "elm");
+        else
+          elm_layout_signal_emit(data, "action,toggle", "efl");
         sd->collapsed++;
         sd->anim = EINA_TRUE;
         elm_widget_tree_unfocusable_set(data, sd->collapsed);
@@ -115,12 +118,20 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
    efl_canvas_group_add(efl_super(obj, MY_CLASS));
    elm_widget_sub_object_parent_add(obj);
 
-   edje_object_signal_callback_add
-     (wd->resize_obj, "anim,done", "efl",
-     _on_recalc_done, obj);
-   edje_object_signal_callback_add
-     (wd->resize_obj, "action,click", "efl",
-     _on_frame_clicked, obj);
+   if (elm_widget_is_legacy(obj))
+     {
+        edje_object_signal_callback_add(wd->resize_obj, "elm,anim,done", "elm",
+                                        _on_recalc_done, obj);
+        edje_object_signal_callback_add(wd->resize_obj, "elm,action,click", "elm",
+                                        _on_frame_clicked, obj);
+     }
+   else
+     {
+        edje_object_signal_callback_add(wd->resize_obj, "anim,done", "efl",
+                                        _on_recalc_done, obj);
+        edje_object_signal_callback_add(wd->resize_obj, "action,click", "efl",
+                                        _on_frame_clicked, obj);
+     }
 
    elm_widget_can_focus_set(obj, EINA_FALSE);
 
@@ -164,7 +175,10 @@ _efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    collapse = !!collapse;
    if (sd->collapsed == collapse) return;
 
-   elm_layout_signal_emit(obj, "action,switch", "efl");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,action,switch", "elm");
+   else
+     elm_layout_signal_emit(obj, "action,switch", "efl");
    edje_object_message_signal_process(wd->resize_obj);
    sd->collapsed = !!collapse;
    sd->anim = EINA_FALSE;
@@ -181,7 +195,10 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
    collapse = !!collapse;
    if (sd->collapsed == collapse) return;
 
-   elm_layout_signal_emit(obj, "action,toggle", "efl");
+   if (elm_widget_is_legacy(obj))
+     elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
+   else
+     elm_layout_signal_emit(obj, "action,toggle", "efl");
    efl_event_callback_legacy_call
      (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
    sd->collapsed = collapse;
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index a40499fb87..ec7525d41e 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -267,9 +267,12 @@ _grid_load(Evas_Object *obj,
                   sd->preload_num++;
                   if (sd->preload_num == 1)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "state,busy,start", "efl");
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "elm,state,busy,start", "elm");
+                       else
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "state,busy,start", "efl");
                        efl_event_callback_legacy_call
                         (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
                     }
@@ -279,9 +282,12 @@ _grid_load(Evas_Object *obj,
                   sd->preload_num--;
                   if (!sd->preload_num)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "state,busy,stop", "efl");
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "elm,state,busy,stop", "elm");
+                       else
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "state,busy,stop", "efl");
                        efl_event_callback_legacy_call
                         (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
                     }
@@ -477,9 +483,13 @@ _grid_clear(Evas_Object *obj,
                   sd->preload_num--;
                   if (!sd->preload_num)
                     {
-                       edje_object_signal_emit
-                         (wd->resize_obj,
-                         "state,busy,stop", "efl");
+
+                       if (elm_widget_is_legacy(obj))
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "elm,state,busy,stop", "elm");
+                       else
+                         edje_object_signal_emit(wd->resize_obj,
+                                                 "state,busy,stop", "efl");
                        efl_event_callback_legacy_call
                          (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
                     }
@@ -510,9 +520,12 @@ _tile_preloaded_cb(void *data,
         sd->preload_num--;
         if (!sd->preload_num)
           {
-             edje_object_signal_emit
-               (wd->resize_obj, "state,busy,stop",
-               "efl");
+             if (elm_widget_is_legacy(git->obj))
+               edje_object_signal_emit(wd->resize_obj, "elm,state,busy,stop",
+                                       "elm");
+             else
+               edje_object_signal_emit(wd->resize_obj, "state,busy,stop",
+                                       "efl");
              efl_event_callback_legacy_call
                (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
           }
@@ -715,8 +728,10 @@ _main_img_preloaded_cb(void *data,
    sd->preload_num--;
    if (!sd->preload_num)
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "state,busy,stop", "efl");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit(wd->resize_obj, "elm,state,busy,stop", "elm");
+        else
+          edje_object_signal_emit(wd->resize_obj, "state,busy,stop", "efl");
         efl_event_callback_legacy_call
           (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
      }
@@ -872,14 +887,18 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image
 
    if (efl_ui_focus_object_focus_get(obj))
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "action,focus", "efl");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit(wd->resize_obj, "elm,action,focus", "elm");
+        else
+          edje_object_signal_emit(wd->resize_obj, "action,focus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_TRUE);
      }
    else
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "action,unfocus", "efl");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit(wd->resize_obj, "elm,action,unfocus", "elm");
+        else
+          edje_object_signal_emit(wd->resize_obj, "action,unfocus", "efl");
         evas_object_focus_set(wd->resize_obj, EINA_FALSE);
      }
 
@@ -1521,10 +1540,20 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
+     }
+   else
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl");
+     }
 }
 
 static void
@@ -1534,73 +1563,102 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
    ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
    Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
 
-   if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
-     edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl");
-   else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
-     edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl");
+   if (elm_widget_is_legacy(obj))
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
+     }
+   else
+     {
+        if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
+          edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl");
+        else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
+          edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl");
+     }
 }
 
 static void
 _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
 {
    efl_layout_signal_callback_add
-     (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
-   efl_layout_signal_callback_add
-     (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
-     obj);
-   efl_layout_signal_callback_add
-     (obj, "drag,set", "elm.dragable.vbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
-   efl_layout_signal_callback_add
-     (obj, "drag,start", "elm.dragable.vbar",
-     _efl_ui_image_zoomable_edje_drag_start_cb, obj);
-   efl_layout_signal_callback_add
-     (obj, "drag,stop", "elm.dragable.vbar",
-     _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
-   efl_layout_signal_callback_add
-     (obj, "drag,step", "elm.dragable.vbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
+      (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
+       obj);
    efl_layout_signal_callback_add
-     (obj, "drag,page", "elm.dragable.vbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
+      (obj, "drag,set", "elm.dragable.vbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "vbar,press", "efl",
-     _efl_ui_image_zoomable_vbar_press_cb, obj);
+      (obj, "drag,start", "elm.dragable.vbar",
+       _efl_ui_image_zoomable_edje_drag_start_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "vbar,unpress", "efl",
-     _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+      (obj, "drag,stop", "elm.dragable.vbar",
+       _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
-     obj);
+      (obj, "drag,step", "elm.dragable.vbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,set", "elm.dragable.hbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
+      (obj, "drag,page", "elm.dragable.vbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,start", "elm.dragable.hbar",
-     _efl_ui_image_zoomable_edje_drag_start_cb, obj);
+      (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
+       obj);
    efl_layout_signal_callback_add
-     (obj, "drag,stop", "elm.dragable.hbar",
-     _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
+      (obj, "drag,set", "elm.dragable.hbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,step", "elm.dragable.hbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
+      (obj, "drag,start", "elm.dragable.hbar",
+       _efl_ui_image_zoomable_edje_drag_start_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "drag,page", "elm.dragable.hbar",
-     _efl_ui_image_zoomable_edje_drag_cb, obj);
+      (obj, "drag,stop", "elm.dragable.hbar",
+       _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "hbar,press", "efl",
-     _efl_ui_image_zoomable_hbar_press_cb, obj);
+      (obj, "drag,step", "elm.dragable.hbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_add
-     (obj, "hbar,unpress", "efl",
-     _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+      (obj, "drag,page", "elm.dragable.hbar",
+       _efl_ui_image_zoomable_edje_drag_cb, obj);
+
+   if (elm_widget_is_legacy(obj))
+     {
+        efl_layout_signal_callback_add
+           (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "elm,vbar,press", "elm",
+            _efl_ui_image_zoomable_vbar_press_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "elm,vbar,unpress", "elm",
+            _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "elm,hbar,press", "elm",
+            _efl_ui_image_zoomable_hbar_press_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "elm,hbar,unpress", "elm",
+            _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+     }
+   else
+     {
+        efl_layout_signal_callback_add
+           (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "vbar,press", "efl",
+            _efl_ui_image_zoomable_vbar_press_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "vbar,unpress", "efl",
+            _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "hbar,press", "efl",
+            _efl_ui_image_zoomable_hbar_press_cb, obj);
+        efl_layout_signal_callback_add
+           (obj, "hbar,unpress", "efl",
+            _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+     }
 }
 
 static void
 _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
 {
    efl_layout_signal_callback_del
-     (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
-   efl_layout_signal_callback_del
      (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
      obj);
    efl_layout_signal_callback_del
@@ -1619,12 +1677,6 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
      (obj, "drag,page", "elm.dragable.vbar",
      _efl_ui_image_zoomable_edje_drag_cb, obj);
    efl_layout_signal_callback_del
-     (obj, "vbar,press", "efl",
-     _efl_ui_image_zoomable_vbar_press_cb, obj);
-   efl_layout_signal_callback_del
-     (obj, "vbar,unpress", "efl",
-     _efl_ui_image_zoomable_vbar_unpress_cb, obj);
-   efl_layout_signal_callback_del
      (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
      obj);
    efl_layout_signal_callback_del
@@ -1642,12 +1694,41 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
    efl_layout_signal_callback_del
      (obj, "drag,page", "elm.dragable.hbar",
      _efl_ui_image_zoomable_edje_drag_cb, obj);
-   efl_layout_signal_callback_del
-     (obj, "hbar,press", "efl",
-     _efl_ui_image_zoomable_hbar_press_cb, obj);
-   efl_layout_signal_callback_del
-     (obj, "hbar,unpress", "efl",
-     _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+
+   if (elm_widget_is_legacy(obj))
+     {
+        efl_layout_signal_callback_del
+           (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "elm,vbar,press", "elm",
+            _efl_ui_image_zoomable_vbar_press_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "elm,vbar,unpress", "elm",
+            _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "elm,hbar,press", "elm",
+            _efl_ui_image_zoomable_hbar_press_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "elm,hbar,unpress", "elm",
+            _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+     }
+   else
+     {
+        efl_layout_signal_callback_del
+           (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "vbar,press", "efl",
+            _efl_ui_image_zoomable_vbar_press_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "vbar,unpress", "efl",
+            _efl_ui_image_zoomable_vbar_unpress_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "hbar,press", "efl",
+            _efl_ui_image_zoomable_hbar_press_cb, obj);
+        efl_layout_signal_callback_del
+           (obj, "hbar,unpress", "efl",
+            _efl_ui_image_zoomable_hbar_unpress_cb, obj);
+     }
 }
 
 EOLIAN static void
@@ -1901,8 +1982,10 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
-        edje_object_signal_emit
-           (wd->resize_obj, "state,busy,start", "efl");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit(wd->resize_obj, "elm,state,busy,start", "elm");
+        else
+          edje_object_signal_emit(wd->resize_obj, "state,busy,start", "efl");
         efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
      }
 
@@ -1985,8 +2068,10 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Ei
    sd->preload_num++;
    if (sd->preload_num == 1)
      {
-        edje_object_signal_emit
-          (wd->resize_obj, "state,busy,start", "efl");
+        if (elm_widget_is_legacy(obj))
+          edje_object_signal_emit(wd->resize_obj, "elm,state,busy,start", "elm");
+        else
+          edje_object_signal_emit(wd->resize_obj, "state,busy,start", "efl");
         efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
      }
 
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index c4547a802b..89a8989aae 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -450,12 +450,12 @@ _efl_ui_layout_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *
      {
         if (efl_ui_focus_object_focus_get(obj))
           {
-             elm_layout_signal_emit(obj, "action,focus", "elm");
+             elm_layout_signal_emit(obj, "action,focus", "efl");
              evas_object_focus_set(wd->resize_obj, EINA_TRUE);
           }
         else
           {
-             elm_layout_signal_emit(obj, "action,unfocus", "elm");
+             elm_layout_signal_emit(obj, "action,unfocus", "efl");
              evas_object_focus_set(wd->resize_obj, EINA_FALSE);
           }
      }