summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-16 21:22:44 +0900
committerJaehyun Cho <jae_hyun.cho@samsung.com>2018-04-16 21:26:07 +0900
commite43aac6bf5096865990717cbdd086fc6a0e6177d (patch)
treed932201d1ea53b2b005dff2ae04be9222f45b5a9
parentb7ee5d608d384571c66d1de98e4dee4637b191d7 (diff)
fix signals for check, frame, image_zoomable, layout.devs/ami/theme-signal-renaming
signals for both efl_ui and legacy should be supported.
-rw-r--r--src/lib/elementary/efl_ui_check.c139
-rw-r--r--src/lib/elementary/efl_ui_frame.c35
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c249
-rw-r--r--src/lib/elementary/efl_ui_layout.c4
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)
60 // so that we can distinguish between state change by user or state change 60 // so that we can distinguish between state change by user or state change
61 // by calling state_change() api. Keep both the signal for backward compatibility 61 // by calling state_change() api. Keep both the signal for backward compatibility
62 // and remove "state,check,on" signal emission when we can break ABI. 62 // and remove "state,check,on" signal emission when we can break ABI.
63 elm_layout_signal_emit(obj, "activate,check,on", "efl"); 63 if (elm_widget_is_legacy(obj))
64 elm_layout_signal_emit(obj, "state,check,on", "efl"); 64 {
65 elm_layout_signal_emit(obj, "elm,activate,check,on", "elm");
66 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
67 }
68 else
69 {
70 elm_layout_signal_emit(obj, "activate,check,on", "efl");
71 elm_layout_signal_emit(obj, "state,check,on", "efl");
72 }
65 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 73 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
66 _elm_access_say(E_("State: On")); 74 _elm_access_say(E_("State: On"));
67 } 75 }
@@ -71,8 +79,16 @@ _activate(Evas_Object *obj)
71 // so that we can distinguish between state change by user or state change 79 // so that we can distinguish between state change by user or state change
72 // by calling state_change() api. Keep both the signal for backward compatibility 80 // by calling state_change() api. Keep both the signal for backward compatibility
73 // and remove "state,check,off" signal emission when we can break ABI. 81 // and remove "state,check,off" signal emission when we can break ABI.
74 elm_layout_signal_emit(obj, "activate,check,off", "efl"); 82 if (elm_widget_is_legacy(obj))
75 elm_layout_signal_emit(obj, "state,check,off", "efl"); 83 {
84 elm_layout_signal_emit(obj, "elm,activate,check,off", "elm");
85 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
86 }
87 else
88 {
89 elm_layout_signal_emit(obj, "activate,check,off", "efl");
90 elm_layout_signal_emit(obj, "state,check,off", "efl");
91 }
76 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF) 92 if (_elm_config->access_mode != ELM_ACCESS_MODE_OFF)
77 _elm_access_say(E_("State: Off")); 93 _elm_access_say(E_("State: Off"));
78 } 94 }
@@ -127,10 +143,20 @@ _efl_ui_check_efl_ui_widget_theme_apply(Eo *obj, Efl_Ui_Check_Data *sd EINA_UNUS
127 143
128 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED; 144 if (!int_ret) return EFL_UI_THEME_APPLY_FAILED;
129 145
130 if (efl_ui_nstate_value_get(obj) == 0) 146 if (elm_widget_is_legacy(obj))
131 elm_layout_signal_emit(obj, "state,check,off", "efl"); 147 {
148 if (efl_ui_nstate_value_get(obj) == 0)
149 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
150 else
151 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
152 }
132 else 153 else
133 elm_layout_signal_emit(obj, "state,check,on", "efl"); 154 {
155 if (efl_ui_nstate_value_get(obj) == 0)
156 elm_layout_signal_emit(obj, "state,check,off", "efl");
157 else
158 elm_layout_signal_emit(obj, "state,check,on", "efl");
159 }
134 160
135 edje_object_message_signal_process(wd->resize_obj); 161 edje_object_message_signal_process(wd->resize_obj);
136 162
@@ -195,7 +221,10 @@ _on_check_off(void *data,
195 EFL_UI_CHECK_DATA_GET(obj, sd); 221 EFL_UI_CHECK_DATA_GET(obj, sd);
196 222
197 if (sd->statep) *sd->statep = 0; 223 if (sd->statep) *sd->statep = 0;
198 elm_layout_signal_emit(obj, "state,check,off", "efl"); 224 if (elm_widget_is_legacy(obj))
225 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
226 else
227 elm_layout_signal_emit(obj, "state,check,off", "efl");
199 efl_ui_nstate_value_set(obj, 0); 228 efl_ui_nstate_value_set(obj, 0);
200 229
201 if (_elm_config->atspi_mode) 230 if (_elm_config->atspi_mode)
@@ -215,7 +244,10 @@ _on_check_on(void *data,
215 EFL_UI_CHECK_DATA_GET(obj, sd); 244 EFL_UI_CHECK_DATA_GET(obj, sd);
216 245
217 if (sd->statep) *sd->statep = 1; 246 if (sd->statep) *sd->statep = 1;
218 elm_layout_signal_emit(obj, "state,check,on", "efl"); 247 if (elm_widget_is_legacy(obj))
248 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
249 else
250 elm_layout_signal_emit(obj, "state,check,on", "efl");
219 efl_ui_nstate_value_set(obj, 1); 251 efl_ui_nstate_value_set(obj, 1);
220 252
221 if (_elm_config->atspi_mode) 253 if (_elm_config->atspi_mode)
@@ -246,10 +278,21 @@ _efl_ui_check_selected_set(Eo *obj, Efl_Ui_Check_Data *sd, Eina_Bool value)
246 278
247 if (sd->statep) *sd->statep = value; 279 if (sd->statep) *sd->statep = value;
248 280
249 if (value == 1) 281 if (elm_widget_is_legacy(obj))
250 elm_layout_signal_emit(obj, "state,check,on", "efl"); 282 {
283 if (value == 1)
284 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
285 else
286 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
287
288 }
251 else 289 else
252 elm_layout_signal_emit(obj, "state,check,off", "efl"); 290 {
291 if (value == 1)
292 elm_layout_signal_emit(obj, "state,check,on", "efl");
293 else
294 elm_layout_signal_emit(obj, "state,check,off", "efl");
295 }
253 296
254 edje_object_message_signal_process(wd->resize_obj); 297 edje_object_message_signal_process(wd->resize_obj);
255 298
@@ -280,12 +323,24 @@ _efl_ui_check_efl_object_constructor(Eo *obj, Efl_Ui_Check_Data *pd EINA_UNUSED)
280 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks); 323 evas_object_smart_callbacks_descriptions_set(obj, _smart_callbacks);
281 324
282 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL); 325 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd, NULL);
283 efl_layout_signal_callback_add 326 if (elm_widget_is_legacy(obj))
284 (wd->resize_obj, "action,check,on", "*", _on_check_on, obj); 327 {
285 efl_layout_signal_callback_add 328 efl_layout_signal_callback_add
286 (wd->resize_obj, "action,check,off", "*", _on_check_off, obj); 329 (wd->resize_obj, "elm,action,check,on", "*", _on_check_on, obj);
287 efl_layout_signal_callback_add 330 efl_layout_signal_callback_add
288 (wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj); 331 (wd->resize_obj, "elm,action,check,off", "*", _on_check_off, obj);
332 efl_layout_signal_callback_add
333 (wd->resize_obj, "elm,action,check,toggle", "*", _on_check_toggle, obj);
334 }
335 else
336 {
337 efl_layout_signal_callback_add
338 (wd->resize_obj, "action,check,on", "*", _on_check_on, obj);
339 efl_layout_signal_callback_add
340 (wd->resize_obj, "action,check,off", "*", _on_check_off, obj);
341 efl_layout_signal_callback_add
342 (wd->resize_obj, "action,check,toggle", "*", _on_check_toggle, obj);
343 }
289 344
290 efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX); 345 efl_access_role_set(obj, EFL_ACCESS_ROLE_CHECK_BOX);
291 _elm_access_object_register(obj, wd->resize_obj); 346 _elm_access_object_register(obj, wd->resize_obj);
@@ -313,10 +368,20 @@ elm_check_state_set(Evas_Object *obj, Eina_Bool state)
313 nd->state = state; 368 nd->state = state;
314 if (sd->statep) *sd->statep = state; 369 if (sd->statep) *sd->statep = state;
315 370
316 if (state == 1) 371 if (elm_widget_is_legacy(obj))
317 elm_layout_signal_emit(obj, "state,check,on", "efl"); 372 {
373 if (state == 1)
374 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
375 else
376 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
377 }
318 else 378 else
319 elm_layout_signal_emit(obj, "state,check,off", "efl"); 379 {
380 if (state == 1)
381 elm_layout_signal_emit(obj, "state,check,on", "efl");
382 else
383 elm_layout_signal_emit(obj, "state,check,off", "efl");
384 }
320 edje_object_message_signal_process(wd->resize_obj); 385 edje_object_message_signal_process(wd->resize_obj);
321 } 386 }
322} 387}
@@ -343,10 +408,20 @@ elm_check_state_pointer_set(Eo *obj, Eina_Bool *statep)
343 if (*sd->statep != nd->state) 408 if (*sd->statep != nd->state)
344 { 409 {
345 nd->state = *sd->statep; 410 nd->state = *sd->statep;
346 if (nd->state == 1) 411 if (elm_widget_is_legacy(obj))
347 elm_layout_signal_emit(obj, "state,check,on", "efl"); 412 {
413 if (nd->state == 1)
414 elm_layout_signal_emit(obj, "elm,state,check,on", "elm");
415 else
416 elm_layout_signal_emit(obj, "elm,state,check,off", "elm");
417 }
348 else 418 else
349 elm_layout_signal_emit(obj, "state,check,off", "efl"); 419 {
420 if (nd->state == 1)
421 elm_layout_signal_emit(obj, "state,check,on", "efl");
422 else
423 elm_layout_signal_emit(obj, "state,check,off", "efl");
424 }
350 } 425 }
351} 426}
352 427
@@ -402,10 +477,18 @@ _icon_signal_emit(Evas_Object *obj)
402 char buf[64]; 477 char buf[64];
403 478
404 if (!elm_widget_resize_object_get(obj)) return; 479 if (!elm_widget_resize_object_get(obj)) return;
405 snprintf(buf, sizeof(buf), "state,icon,%s", 480 if (elm_widget_is_legacy(obj))
406 elm_layout_content_get(obj, "icon") ? "visible" : "hidden"); 481 {
407 482 snprintf(buf, sizeof(buf), "elm,state,icon,%s",
408 elm_layout_signal_emit(obj, buf, "efl"); 483 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
484 elm_layout_signal_emit(obj, buf, "elm");
485 }
486 else
487 {
488 snprintf(buf, sizeof(buf), "state,icon,%s",
489 elm_layout_content_get(obj, "icon") ? "visible" : "hidden");
490 elm_layout_signal_emit(obj, buf, "efl");
491 }
409 edje_object_message_signal_process(wd->resize_obj); 492 edje_object_message_signal_process(wd->resize_obj);
410 493
411 elm_layout_sizing_eval(obj); 494 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,
82 if (sd->collapsible) 82 if (sd->collapsible)
83 { 83 {
84 efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data); 84 efl_event_callback_add(wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, _recalc, data);
85 elm_layout_signal_emit(data, "action,toggle", "efl"); 85 if (elm_widget_is_legacy(data))
86 elm_layout_signal_emit(data, "elm,action,toggle", "elm");
87 else
88 elm_layout_signal_emit(data, "action,toggle", "efl");
86 sd->collapsed++; 89 sd->collapsed++;
87 sd->anim = EINA_TRUE; 90 sd->anim = EINA_TRUE;
88 elm_widget_tree_unfocusable_set(data, sd->collapsed); 91 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
115 efl_canvas_group_add(efl_super(obj, MY_CLASS)); 118 efl_canvas_group_add(efl_super(obj, MY_CLASS));
116 elm_widget_sub_object_parent_add(obj); 119 elm_widget_sub_object_parent_add(obj);
117 120
118 edje_object_signal_callback_add 121 if (elm_widget_is_legacy(obj))
119 (wd->resize_obj, "anim,done", "efl", 122 {
120 _on_recalc_done, obj); 123 edje_object_signal_callback_add(wd->resize_obj, "elm,anim,done", "elm",
121 edje_object_signal_callback_add 124 _on_recalc_done, obj);
122 (wd->resize_obj, "action,click", "efl", 125 edje_object_signal_callback_add(wd->resize_obj, "elm,action,click", "elm",
123 _on_frame_clicked, obj); 126 _on_frame_clicked, obj);
127 }
128 else
129 {
130 edje_object_signal_callback_add(wd->resize_obj, "anim,done", "efl",
131 _on_recalc_done, obj);
132 edje_object_signal_callback_add(wd->resize_obj, "action,click", "efl",
133 _on_frame_clicked, obj);
134 }
124 135
125 elm_widget_can_focus_set(obj, EINA_FALSE); 136 elm_widget_can_focus_set(obj, EINA_FALSE);
126 137
@@ -164,7 +175,10 @@ _efl_ui_frame_collapse_set(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
164 collapse = !!collapse; 175 collapse = !!collapse;
165 if (sd->collapsed == collapse) return; 176 if (sd->collapsed == collapse) return;
166 177
167 elm_layout_signal_emit(obj, "action,switch", "efl"); 178 if (elm_widget_is_legacy(obj))
179 elm_layout_signal_emit(obj, "elm,action,switch", "elm");
180 else
181 elm_layout_signal_emit(obj, "action,switch", "efl");
168 edje_object_message_signal_process(wd->resize_obj); 182 edje_object_message_signal_process(wd->resize_obj);
169 sd->collapsed = !!collapse; 183 sd->collapsed = !!collapse;
170 sd->anim = EINA_FALSE; 184 sd->anim = EINA_FALSE;
@@ -181,7 +195,10 @@ _efl_ui_frame_collapse_go(Eo *obj, Efl_Ui_Frame_Data *sd, Eina_Bool collapse)
181 collapse = !!collapse; 195 collapse = !!collapse;
182 if (sd->collapsed == collapse) return; 196 if (sd->collapsed == collapse) return;
183 197
184 elm_layout_signal_emit(obj, "action,toggle", "efl"); 198 if (elm_widget_is_legacy(obj))
199 elm_layout_signal_emit(obj, "elm,action,toggle", "elm");
200 else
201 elm_layout_signal_emit(obj, "action,toggle", "efl");
185 efl_event_callback_legacy_call 202 efl_event_callback_legacy_call
186 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj); 203 (wd->resize_obj, EFL_LAYOUT_EVENT_RECALC, obj);
187 sd->collapsed = collapse; 204 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,
267 sd->preload_num++; 267 sd->preload_num++;
268 if (sd->preload_num == 1) 268 if (sd->preload_num == 1)
269 { 269 {
270 edje_object_signal_emit 270 if (elm_widget_is_legacy(obj))
271 (wd->resize_obj, 271 edje_object_signal_emit(wd->resize_obj,
272 "state,busy,start", "efl"); 272 "elm,state,busy,start", "elm");
273 else
274 edje_object_signal_emit(wd->resize_obj,
275 "state,busy,start", "efl");
273 efl_event_callback_legacy_call 276 efl_event_callback_legacy_call
274 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 277 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
275 } 278 }
@@ -279,9 +282,12 @@ _grid_load(Evas_Object *obj,
279 sd->preload_num--; 282 sd->preload_num--;
280 if (!sd->preload_num) 283 if (!sd->preload_num)
281 { 284 {
282 edje_object_signal_emit 285 if (elm_widget_is_legacy(obj))
283 (wd->resize_obj, 286 edje_object_signal_emit(wd->resize_obj,
284 "state,busy,stop", "efl"); 287 "elm,state,busy,stop", "elm");
288 else
289 edje_object_signal_emit(wd->resize_obj,
290 "state,busy,stop", "efl");
285 efl_event_callback_legacy_call 291 efl_event_callback_legacy_call
286 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 292 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
287 } 293 }
@@ -477,9 +483,13 @@ _grid_clear(Evas_Object *obj,
477 sd->preload_num--; 483 sd->preload_num--;
478 if (!sd->preload_num) 484 if (!sd->preload_num)
479 { 485 {
480 edje_object_signal_emit 486
481 (wd->resize_obj, 487 if (elm_widget_is_legacy(obj))
482 "state,busy,stop", "efl"); 488 edje_object_signal_emit(wd->resize_obj,
489 "elm,state,busy,stop", "elm");
490 else
491 edje_object_signal_emit(wd->resize_obj,
492 "state,busy,stop", "efl");
483 efl_event_callback_legacy_call 493 efl_event_callback_legacy_call
484 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 494 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
485 } 495 }
@@ -510,9 +520,12 @@ _tile_preloaded_cb(void *data,
510 sd->preload_num--; 520 sd->preload_num--;
511 if (!sd->preload_num) 521 if (!sd->preload_num)
512 { 522 {
513 edje_object_signal_emit 523 if (elm_widget_is_legacy(git->obj))
514 (wd->resize_obj, "state,busy,stop", 524 edje_object_signal_emit(wd->resize_obj, "elm,state,busy,stop",
515 "efl"); 525 "elm");
526 else
527 edje_object_signal_emit(wd->resize_obj, "state,busy,stop",
528 "efl");
516 efl_event_callback_legacy_call 529 efl_event_callback_legacy_call
517 (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 530 (wd->obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
518 } 531 }
@@ -715,8 +728,10 @@ _main_img_preloaded_cb(void *data,
715 sd->preload_num--; 728 sd->preload_num--;
716 if (!sd->preload_num) 729 if (!sd->preload_num)
717 { 730 {
718 edje_object_signal_emit 731 if (elm_widget_is_legacy(obj))
719 (wd->resize_obj, "state,busy,stop", "efl"); 732 edje_object_signal_emit(wd->resize_obj, "elm,state,busy,stop", "elm");
733 else
734 edje_object_signal_emit(wd->resize_obj, "state,busy,stop", "efl");
720 efl_event_callback_legacy_call 735 efl_event_callback_legacy_call
721 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL); 736 (obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOADED_DETAIL, NULL);
722 } 737 }
@@ -872,14 +887,18 @@ _efl_ui_image_zoomable_efl_ui_focus_object_on_focus_update(Eo *obj, Efl_Ui_Image
872 887
873 if (efl_ui_focus_object_focus_get(obj)) 888 if (efl_ui_focus_object_focus_get(obj))
874 { 889 {
875 edje_object_signal_emit 890 if (elm_widget_is_legacy(obj))
876 (wd->resize_obj, "action,focus", "efl"); 891 edje_object_signal_emit(wd->resize_obj, "elm,action,focus", "elm");
892 else
893 edje_object_signal_emit(wd->resize_obj, "action,focus", "efl");
877 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 894 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
878 } 895 }
879 else 896 else
880 { 897 {
881 edje_object_signal_emit 898 if (elm_widget_is_legacy(obj))
882 (wd->resize_obj, "action,unfocus", "efl"); 899 edje_object_signal_emit(wd->resize_obj, "elm,action,unfocus", "elm");
900 else
901 edje_object_signal_emit(wd->resize_obj, "action,unfocus", "efl");
883 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 902 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
884 } 903 }
885 904
@@ -1521,10 +1540,20 @@ _efl_ui_image_zoomable_bar_show_cb(void *data, const Efl_Event *event)
1521 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1540 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1522 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 1541 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
1523 1542
1524 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 1543 if (elm_widget_is_legacy(obj))
1525 edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl"); 1544 {
1526 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 1545 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1527 edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl"); 1546 edje_object_signal_emit(wd->resize_obj, "elm,action,show,hbar", "elm");
1547 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1548 edje_object_signal_emit(wd->resize_obj, "elm,action,show,vbar", "elm");
1549 }
1550 else
1551 {
1552 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1553 edje_object_signal_emit(wd->resize_obj, "action,show,hbar", "efl");
1554 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1555 edje_object_signal_emit(wd->resize_obj, "action,show,vbar", "efl");
1556 }
1528} 1557}
1529 1558
1530static void 1559static void
@@ -1534,73 +1563,102 @@ _efl_ui_image_zoomable_bar_hide_cb(void *data, const Efl_Event *event)
1534 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd); 1563 ELM_WIDGET_DATA_GET_OR_RETURN(obj, wd);
1535 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info); 1564 Efl_Ui_Scrollbar_Direction type = *(Efl_Ui_Scrollbar_Direction *)(event->info);
1536 1565
1537 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL) 1566 if (elm_widget_is_legacy(obj))
1538 edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl"); 1567 {
1539 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL) 1568 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1540 edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl"); 1569 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,hbar", "elm");
1570 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1571 edje_object_signal_emit(wd->resize_obj, "elm,action,hide,vbar", "elm");
1572 }
1573 else
1574 {
1575 if (type == EFL_UI_SCROLLBAR_DIRECTION_HORIZONTAL)
1576 edje_object_signal_emit(wd->resize_obj, "action,hide,hbar", "efl");
1577 else if (type == EFL_UI_SCROLLBAR_DIRECTION_VERTICAL)
1578 edje_object_signal_emit(wd->resize_obj, "action,hide,vbar", "efl");
1579 }
1541} 1580}
1542 1581
1543static void 1582static void
1544_efl_ui_image_zoomable_edje_object_attach(Eo *obj) 1583_efl_ui_image_zoomable_edje_object_attach(Eo *obj)
1545{ 1584{
1546 efl_layout_signal_callback_add 1585 efl_layout_signal_callback_add
1547 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj); 1586 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1548 efl_layout_signal_callback_add 1587 obj);
1549 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1550 obj);
1551 efl_layout_signal_callback_add
1552 (obj, "drag,set", "elm.dragable.vbar",
1553 _efl_ui_image_zoomable_edje_drag_cb, obj);
1554 efl_layout_signal_callback_add
1555 (obj, "drag,start", "elm.dragable.vbar",
1556 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1557 efl_layout_signal_callback_add
1558 (obj, "drag,stop", "elm.dragable.vbar",
1559 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1560 efl_layout_signal_callback_add
1561 (obj, "drag,step", "elm.dragable.vbar",
1562 _efl_ui_image_zoomable_edje_drag_cb, obj);
1563 efl_layout_signal_callback_add 1588 efl_layout_signal_callback_add
1564 (obj, "drag,page", "elm.dragable.vbar", 1589 (obj, "drag,set", "elm.dragable.vbar",
1565 _efl_ui_image_zoomable_edje_drag_cb, obj); 1590 _efl_ui_image_zoomable_edje_drag_cb, obj);
1566 efl_layout_signal_callback_add 1591 efl_layout_signal_callback_add
1567 (obj, "vbar,press", "efl", 1592 (obj, "drag,start", "elm.dragable.vbar",
1568 _efl_ui_image_zoomable_vbar_press_cb, obj); 1593 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1569 efl_layout_signal_callback_add 1594 efl_layout_signal_callback_add
1570 (obj, "vbar,unpress", "efl", 1595 (obj, "drag,stop", "elm.dragable.vbar",
1571 _efl_ui_image_zoomable_vbar_unpress_cb, obj); 1596 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1572 efl_layout_signal_callback_add 1597 efl_layout_signal_callback_add
1573 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1598 (obj, "drag,step", "elm.dragable.vbar",
1574 obj); 1599 _efl_ui_image_zoomable_edje_drag_cb, obj);
1575 efl_layout_signal_callback_add 1600 efl_layout_signal_callback_add
1576 (obj, "drag,set", "elm.dragable.hbar", 1601 (obj, "drag,page", "elm.dragable.vbar",
1577 _efl_ui_image_zoomable_edje_drag_cb, obj); 1602 _efl_ui_image_zoomable_edje_drag_cb, obj);
1578 efl_layout_signal_callback_add 1603 efl_layout_signal_callback_add
1579 (obj, "drag,start", "elm.dragable.hbar", 1604 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
1580 _efl_ui_image_zoomable_edje_drag_start_cb, obj); 1605 obj);
1581 efl_layout_signal_callback_add 1606 efl_layout_signal_callback_add
1582 (obj, "drag,stop", "elm.dragable.hbar", 1607 (obj, "drag,set", "elm.dragable.hbar",
1583 _efl_ui_image_zoomable_edje_drag_stop_cb, obj); 1608 _efl_ui_image_zoomable_edje_drag_cb, obj);
1584 efl_layout_signal_callback_add 1609 efl_layout_signal_callback_add
1585 (obj, "drag,step", "elm.dragable.hbar", 1610 (obj, "drag,start", "elm.dragable.hbar",
1586 _efl_ui_image_zoomable_edje_drag_cb, obj); 1611 _efl_ui_image_zoomable_edje_drag_start_cb, obj);
1587 efl_layout_signal_callback_add 1612 efl_layout_signal_callback_add
1588 (obj, "drag,page", "elm.dragable.hbar", 1613 (obj, "drag,stop", "elm.dragable.hbar",
1589 _efl_ui_image_zoomable_edje_drag_cb, obj); 1614 _efl_ui_image_zoomable_edje_drag_stop_cb, obj);
1590 efl_layout_signal_callback_add 1615 efl_layout_signal_callback_add
1591 (obj, "hbar,press", "efl", 1616 (obj, "drag,step", "elm.dragable.hbar",
1592 _efl_ui_image_zoomable_hbar_press_cb, obj); 1617 _efl_ui_image_zoomable_edje_drag_cb, obj);
1593 efl_layout_signal_callback_add 1618 efl_layout_signal_callback_add
1594 (obj, "hbar,unpress", "efl", 1619 (obj, "drag,page", "elm.dragable.hbar",
1595 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1620 _efl_ui_image_zoomable_edje_drag_cb, obj);
1621
1622 if (elm_widget_is_legacy(obj))
1623 {
1624 efl_layout_signal_callback_add
1625 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1626 efl_layout_signal_callback_add
1627 (obj, "elm,vbar,press", "elm",
1628 _efl_ui_image_zoomable_vbar_press_cb, obj);
1629 efl_layout_signal_callback_add
1630 (obj, "elm,vbar,unpress", "elm",
1631 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1632 efl_layout_signal_callback_add
1633 (obj, "elm,hbar,press", "elm",
1634 _efl_ui_image_zoomable_hbar_press_cb, obj);
1635 efl_layout_signal_callback_add
1636 (obj, "elm,hbar,unpress", "elm",
1637 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1638 }
1639 else
1640 {
1641 efl_layout_signal_callback_add
1642 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
1643 efl_layout_signal_callback_add
1644 (obj, "vbar,press", "efl",
1645 _efl_ui_image_zoomable_vbar_press_cb, obj);
1646 efl_layout_signal_callback_add
1647 (obj, "vbar,unpress", "efl",
1648 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1649 efl_layout_signal_callback_add
1650 (obj, "hbar,press", "efl",
1651 _efl_ui_image_zoomable_hbar_press_cb, obj);
1652 efl_layout_signal_callback_add
1653 (obj, "hbar,unpress", "efl",
1654 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1655 }
1596} 1656}
1597 1657
1598static void 1658static void
1599_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj) 1659_efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1600{ 1660{
1601 efl_layout_signal_callback_del 1661 efl_layout_signal_callback_del
1602 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
1603 efl_layout_signal_callback_del
1604 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb, 1662 (obj, "drag", "elm.dragable.vbar", _efl_ui_image_zoomable_vbar_drag_cb,
1605 obj); 1663 obj);
1606 efl_layout_signal_callback_del 1664 efl_layout_signal_callback_del
@@ -1619,12 +1677,6 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1619 (obj, "drag,page", "elm.dragable.vbar", 1677 (obj, "drag,page", "elm.dragable.vbar",
1620 _efl_ui_image_zoomable_edje_drag_cb, obj); 1678 _efl_ui_image_zoomable_edje_drag_cb, obj);
1621 efl_layout_signal_callback_del 1679 efl_layout_signal_callback_del
1622 (obj, "vbar,press", "efl",
1623 _efl_ui_image_zoomable_vbar_press_cb, obj);
1624 efl_layout_signal_callback_del
1625 (obj, "vbar,unpress", "efl",
1626 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1627 efl_layout_signal_callback_del
1628 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb, 1680 (obj, "drag", "elm.dragable.hbar", _efl_ui_image_zoomable_hbar_drag_cb,
1629 obj); 1681 obj);
1630 efl_layout_signal_callback_del 1682 efl_layout_signal_callback_del
@@ -1642,12 +1694,41 @@ _efl_ui_image_zoomable_edje_object_detach(Evas_Object *obj)
1642 efl_layout_signal_callback_del 1694 efl_layout_signal_callback_del
1643 (obj, "drag,page", "elm.dragable.hbar", 1695 (obj, "drag,page", "elm.dragable.hbar",
1644 _efl_ui_image_zoomable_edje_drag_cb, obj); 1696 _efl_ui_image_zoomable_edje_drag_cb, obj);
1645 efl_layout_signal_callback_del 1697
1646 (obj, "hbar,press", "efl", 1698 if (elm_widget_is_legacy(obj))
1647 _efl_ui_image_zoomable_hbar_press_cb, obj); 1699 {
1648 efl_layout_signal_callback_del 1700 efl_layout_signal_callback_del
1649 (obj, "hbar,unpress", "efl", 1701 (obj, "reload", "elm", _efl_ui_image_zoomable_reload_cb, obj);
1650 _efl_ui_image_zoomable_hbar_unpress_cb, obj); 1702 efl_layout_signal_callback_del
1703 (obj, "elm,vbar,press", "elm",
1704 _efl_ui_image_zoomable_vbar_press_cb, obj);
1705 efl_layout_signal_callback_del
1706 (obj, "elm,vbar,unpress", "elm",
1707 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1708 efl_layout_signal_callback_del
1709 (obj, "elm,hbar,press", "elm",
1710 _efl_ui_image_zoomable_hbar_press_cb, obj);
1711 efl_layout_signal_callback_del
1712 (obj, "elm,hbar,unpress", "elm",
1713 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1714 }
1715 else
1716 {
1717 efl_layout_signal_callback_del
1718 (obj, "reload", "efl", _efl_ui_image_zoomable_reload_cb, obj);
1719 efl_layout_signal_callback_del
1720 (obj, "vbar,press", "efl",
1721 _efl_ui_image_zoomable_vbar_press_cb, obj);
1722 efl_layout_signal_callback_del
1723 (obj, "vbar,unpress", "efl",
1724 _efl_ui_image_zoomable_vbar_unpress_cb, obj);
1725 efl_layout_signal_callback_del
1726 (obj, "hbar,press", "efl",
1727 _efl_ui_image_zoomable_hbar_press_cb, obj);
1728 efl_layout_signal_callback_del
1729 (obj, "hbar,unpress", "efl",
1730 _efl_ui_image_zoomable_hbar_unpress_cb, obj);
1731 }
1651} 1732}
1652 1733
1653EOLIAN static void 1734EOLIAN static void
@@ -1901,8 +1982,10 @@ _img_proxy_set(Evas_Object *obj, Efl_Ui_Image_Zoomable_Data *sd,
1901 sd->preload_num++; 1982 sd->preload_num++;
1902 if (sd->preload_num == 1) 1983 if (sd->preload_num == 1)
1903 { 1984 {
1904 edje_object_signal_emit 1985 if (elm_widget_is_legacy(obj))
1905 (wd->resize_obj, "state,busy,start", "efl"); 1986 edje_object_signal_emit(wd->resize_obj, "elm,state,busy,start", "elm");
1987 else
1988 edje_object_signal_emit(wd->resize_obj, "state,busy,start", "efl");
1906 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 1989 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
1907 } 1990 }
1908 1991
@@ -1985,8 +2068,10 @@ _internal_file_set(Eo *obj, Efl_Ui_Image_Zoomable_Data *sd, const char *file, Ei
1985 sd->preload_num++; 2068 sd->preload_num++;
1986 if (sd->preload_num == 1) 2069 if (sd->preload_num == 1)
1987 { 2070 {
1988 edje_object_signal_emit 2071 if (elm_widget_is_legacy(obj))
1989 (wd->resize_obj, "state,busy,start", "efl"); 2072 edje_object_signal_emit(wd->resize_obj, "elm,state,busy,start", "elm");
2073 else
2074 edje_object_signal_emit(wd->resize_obj, "state,busy,start", "efl");
1990 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL); 2075 efl_event_callback_legacy_call(obj, EFL_UI_IMAGE_ZOOMABLE_EVENT_LOAD_DETAIL, NULL);
1991 } 2076 }
1992 2077
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 *
450 { 450 {
451 if (efl_ui_focus_object_focus_get(obj)) 451 if (efl_ui_focus_object_focus_get(obj))
452 { 452 {
453 elm_layout_signal_emit(obj, "action,focus", "elm"); 453 elm_layout_signal_emit(obj, "action,focus", "efl");
454 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 454 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
455 } 455 }
456 else 456 else
457 { 457 {
458 elm_layout_signal_emit(obj, "action,unfocus", "elm"); 458 elm_layout_signal_emit(obj, "action,unfocus", "efl");
459 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 459 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
460 } 460 }
461 } 461 }