enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 3 Projects Releases Wiki Activity

fix signals for check, frame, image_zoomable, layout. 

signals for both efl_ui and legacy should be supported.
This commit is contained in:
Jaehyun Cho 2018-04-16 21:22:44 +09:00
parent b7ee5d608d
commit e43aac6bf5
4 changed files with 306 additions and 121 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

139
src/lib/elementary/efl_ui_check.c
View File

@ -60,8 +60,16 @@ _activate(Evas_Object *obj)
// so that we can distinguish between state change by user or state change // 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 // by calling state_change() api. Keep both the signal for backward compatibility
// and remove "state,check,on" signal emission when we can break ABI. // and remove "state,check,on" signal emission when we can break ABI.
elm_layout_signal_emit(obj, "activate,check,on", "efl"); if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,on", "efl"); {
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) if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
_elm_access_say(E_("State: On")); _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 // 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 // by calling state_change() api. Keep both the signal for backward compatibility
// and remove "state,check,off" signal emission when we can break ABI. // and remove "state,check,off" signal emission when we can break ABI.
elm_layout_signal_emit(obj, "activate,check,off", "efl"); if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,off", "efl"); {
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) if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
_elm_access_say(E_("State: 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 (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
if (efl_ui_nstate_value_get(obj) == 0) if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,off", "efl"); {
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 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); edje_object_message_signal_process(wd->resize_obj);
@ -195,7 +221,10 @@ _on_check_off(void *data,
EFL_UI_CHECK_DATA_GET(obj, sd); EFL_UI_CHECK_DATA_GET(obj, sd);
if (sd->statep) *sd->statep = 0; 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); efl_ui_nstate_value_set(obj, 0);
if (_elm_config->atspi_mode) if (_elm_config->atspi_mode)
@ -215,7 +244,10 @@ _on_check_on(void *data,
EFL_UI_CHECK_DATA_GET(obj, sd); EFL_UI_CHECK_DATA_GET(obj, sd);
if (sd->statep) *sd->statep = 1; 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); efl_ui_nstate_value_set(obj, 1);
if (_elm_config->atspi_mode) 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 (sd->statep) *sd->statep = value;
if (value == 1) if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,on", "efl"); {
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 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); 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); evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
efl_layout_signal_callback_add if (elm_widget_is_legacy(obj))
(wd->resize_obj, "action,check,on", "*", _on_check_on, obj); {
efl_layout_signal_callback_add efl_layout_signal_callback_add
(wd->resize_obj, "action,check,off", "*", _on_check_off, obj); (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj); (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); efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
_elm_access_object_register(obj, wd->resize_obj); _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; nd->state = state;
if (sd->statep) *sd->statep = state; if (sd->statep) *sd->statep = state;
if (state == 1) if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,on", "efl"); {
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 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); 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) if (*sd->statep != nd->state)
{ {
nd->state = *sd->statep; nd->state = *sd->statep;
if (nd->state == 1) if (elm_widget_is_legacy(obj))
elm_layout_signal_emit(obj, "state,check,on", "efl"); {
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 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]; char buf[64];
if (!elm_widget_resize_object_get(obj)) return; if (!elm_widget_resize_object_get(obj)) return;
snprintf(buf, sizeof(buf), "state,icon,%s", if (elm_widget_is_legacy(obj))
elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); {
snprintf(buf, sizeof(buf), "elm,state,icon,%s",
elm_layout_signal_emit(obj, buf, "efl"); 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); edje_object_message_signal_process(wd->resize_obj);
elm_layout_sizing_eval(obj); elm_layout_sizing_eval(obj);

35
src/lib/elementary/efl_ui_frame.c
View File

@ -82,7 +82,10 @@ _on_frame_clicked(void *data,
if (sd->collapsible) if (sd->collapsible)
{ {
efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); 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->collapsed++;
sd->anim = EINA_TRUE; sd->anim = EINA_TRUE;
elm_widget_tree_unfocusable_set(data, sd->collapsed); 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)); efl_canvas_group_add(efl_super(obj, MY_CLASS));
elm_widget_sub_object_parent_add(obj); elm_widget_sub_object_parent_add(obj);
edje_object_signal_callback_add if (elm_widget_is_legacy(obj))
(wd->resize_obj, "anim,done", "efl", {
_on_recalc_done, obj); edje_object_signal_callback_add(wd->resize_obj, "elm,anim,done", "elm",
edje_object_signal_callback_add _on_recalc_done, obj);
(wd->resize_obj, "action,click", "efl", edje_object_signal_callback_add(wd->resize_obj, "elm,action,click", "elm",
_on_frame_clicked, obj); _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); 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; collapse = !!collapse;
if (sd->collapsed == collapse) return; 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); edje_object_message_signal_process(wd->resize_obj);
sd->collapsed = !!collapse; sd->collapsed = !!collapse;
sd->anim = EINA_FALSE; 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; collapse = !!collapse;
if (sd->collapsed == collapse) return; 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 efl_event_callback_legacy_call
(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj); (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
sd->collapsed = collapse; sd->collapsed = collapse;

249
src/lib/elementary/efl_ui_image_zoomable.c
View File

@ -267,9 +267,12 @@ _grid_load(Evas_Object *obj,
sd->preload_num++; sd->preload_num++;
if (sd->preload_num == 1) if (sd->preload_num == 1)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, edje_object_signal_emit(wd->resize_obj,
"state,busy,start", "efl"); "elm,state,busy,start", "elm");
else
edje_object_signal_emit(wd->resize_obj,
"state,busy,start", "efl");
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
} }
@ -279,9 +282,12 @@ _grid_load(Evas_Object *obj,
sd->preload_num--; sd->preload_num--;
if (!sd->preload_num) if (!sd->preload_num)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, edje_object_signal_emit(wd->resize_obj,
"state,busy,stop", "efl"); "elm,state,busy,stop", "elm");
else
edje_object_signal_emit(wd->resize_obj,
"state,busy,stop", "efl");
efl_event_callback_legacy_call efl_event_callback_legacy_call
(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
} }
@ -477,9 +483,13 @@ _grid_clear(Evas_Object *obj,
sd->preload_num--; sd->preload_num--;
if (!sd->preload_num) if (!sd->preload_num)
{ {
edje_object_signal_emit
(wd->resize_obj, if (elm_widget_is_legacy(obj))
"state,busy,stop", "efl"); 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 efl_event_callback_legacy_call
(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
} }
@ -510,9 +520,12 @@ _tile_preloaded_cb(void *data,
sd->preload_num--; sd->preload_num--;
if (!sd->preload_num) if (!sd->preload_num)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(git->obj))
(wd->resize_obj, "state,busy,stop", edje_object_signal_emit(wd->resize_obj, "elm,state,busy,stop",
"efl"); "elm");
else
edje_object_signal_emit(wd->resize_obj, "state,busy,stop",
"efl");
efl_event_callback_legacy_call efl_event_callback_legacy_call
(wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
} }
@ -715,8 +728,10 @@ _main_img_preloaded_cb(void *data,
sd->preload_num--; sd->preload_num--;
if (!sd->preload_num) if (!sd->preload_num)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, "state,busy,stop", "efl"); 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 efl_event_callback_legacy_call
(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); (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)) if (efl_ui_focus_object_focus_get(obj))
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, "action,focus", "efl"); 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); evas_object_focus_set(wd->resize_obj, EINA_TRUE);
} }
else else
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, "action,unfocus", "efl"); 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); 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); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) if (elm_widget_is_legacy(obj))
edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl"); {
else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl"); 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 static void
@ -1534,72 +1563,101 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) if (elm_widget_is_legacy(obj))
edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl"); {
else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl"); 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 static void
_efl_ui_image_zoomable_edje_object_attach(Eo *obj) _efl_ui_image_zoomable_edje_object_attach(Eo *obj)
{ {
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj); (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, (obj, "drag,set", "elm.dragable.vbar",
obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,set", "elm.dragable.vbar", (obj, "drag,start", "elm.dragable.vbar",
_efl_ui_image_zoomable_edje_drag_cb, obj); _efl_ui_image_zoomable_edje_drag_start_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,start", "elm.dragable.vbar", (obj, "drag,stop", "elm.dragable.vbar",
_efl_ui_image_zoomable_edje_drag_start_cb, obj); _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,stop", "elm.dragable.vbar", (obj, "drag,step", "elm.dragable.vbar",
_efl_ui_image_zoomable_edje_drag_stop_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,step", "elm.dragable.vbar", (obj, "drag,page", "elm.dragable.vbar",
_efl_ui_image_zoomable_edje_drag_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,page", "elm.dragable.vbar", (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
_efl_ui_image_zoomable_edje_drag_cb, obj); obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "vbar,press", "efl", (obj, "drag,set", "elm.dragable.hbar",
_efl_ui_image_zoomable_vbar_press_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "vbar,unpress", "efl", (obj, "drag,start", "elm.dragable.hbar",
_efl_ui_image_zoomable_vbar_unpress_cb, obj); _efl_ui_image_zoomable_edje_drag_start_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, (obj, "drag,stop", "elm.dragable.hbar",
obj); _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,set", "elm.dragable.hbar", (obj, "drag,step", "elm.dragable.hbar",
_efl_ui_image_zoomable_edje_drag_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,start", "elm.dragable.hbar", (obj, "drag,page", "elm.dragable.hbar",
_efl_ui_image_zoomable_edje_drag_start_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_add
(obj, "drag,stop", "elm.dragable.hbar", if (elm_widget_is_legacy(obj))
_efl_ui_image_zoomable_edje_drag_stop_cb, obj); {
efl_layout_signal_callback_add efl_layout_signal_callback_add
(obj, "drag,step", "elm.dragable.hbar", (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
_efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_add
efl_layout_signal_callback_add (obj, "elm,vbar,press", "elm",
(obj, "drag,page", "elm.dragable.hbar", _efl_ui_image_zoomable_vbar_press_cb, obj);
_efl_ui_image_zoomable_edje_drag_cb, obj); efl_layout_signal_callback_add
efl_layout_signal_callback_add (obj, "elm,vbar,unpress", "elm",
(obj, "hbar,press", "efl", _efl_ui_image_zoomable_vbar_unpress_cb, obj);
_efl_ui_image_zoomable_hbar_press_cb, obj); efl_layout_signal_callback_add
efl_layout_signal_callback_add (obj, "elm,hbar,press", "elm",
(obj, "hbar,unpress", "efl", _efl_ui_image_zoomable_hbar_press_cb, obj);
_efl_ui_image_zoomable_hbar_unpress_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 static void
_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) _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 efl_layout_signal_callback_del
(obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
obj); obj);
@ -1618,12 +1676,6 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
efl_layout_signal_callback_del efl_layout_signal_callback_del
(obj, "drag,page", "elm.dragable.vbar", (obj, "drag,page", "elm.dragable.vbar",
_efl_ui_image_zoomable_edje_drag_cb, obj); _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 efl_layout_signal_callback_del
(obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
obj); obj);
@ -1642,12 +1694,41 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
efl_layout_signal_callback_del efl_layout_signal_callback_del
(obj, "drag,page", "elm.dragable.hbar", (obj, "drag,page", "elm.dragable.hbar",
_efl_ui_image_zoomable_edje_drag_cb, obj); _efl_ui_image_zoomable_edje_drag_cb, obj);
efl_layout_signal_callback_del
(obj, "hbar,press", "efl", if (elm_widget_is_legacy(obj))
_efl_ui_image_zoomable_hbar_press_cb, obj); {
efl_layout_signal_callback_del efl_layout_signal_callback_del
(obj, "hbar,unpress", "efl", (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
_efl_ui_image_zoomable_hbar_unpress_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 EOLIAN static void
@ -1901,8 +1982,10 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
sd->preload_num++; sd->preload_num++;
if (sd->preload_num == 1) if (sd->preload_num == 1)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, "state,busy,start", "efl"); 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); 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++; sd->preload_num++;
if (sd->preload_num == 1) if (sd->preload_num == 1)
{ {
edje_object_signal_emit if (elm_widget_is_legacy(obj))
(wd->resize_obj, "state,busy,start", "efl"); 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); efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
} }

4
src/lib/elementary/efl_ui_layout.c
View File

@ -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)) 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); evas_object_focus_set(wd->resize_obj, EINA_TRUE);
} }
else 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); evas_object_focus_set(wd->resize_obj, EINA_FALSE);
} }
} }