1 files changed, 26 insertions, 9 deletions

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;