summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 14:29:16 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2017-10-24 14:37:45 +0900
commit1b481f0ae85b503b2e6afa64b907bba4bf41e006 (patch)
tree9fabf1837e56aadf983686a220f8f2ed93502d29
parent2f465e1fbbe5af837b57c81305c74f3c6c87c3ba (diff)
widget: Rename events to EFL_UI_WIDGET_EVENT_XXX
This only affects the events (and the data type has an alias). Ref T5363
-rw-r--r--src/lib/elementary/efl_ui_layout.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c4
-rw-r--r--src/lib/elementary/elc_fileselector.c4
-rw-r--r--src/lib/elementary/elc_fileselector_entry.c8
-rw-r--r--src/lib/elementary/elc_hoversel.c4
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c8
-rw-r--r--src/lib/elementary/elc_popup.c4
-rw-r--r--src/lib/elementary/elm_entry.c4
-rw-r--r--src/lib/elementary/elm_gengrid.c4
-rw-r--r--src/lib/elementary/elm_spinner.c6
-rw-r--r--src/lib/elementary/elm_widget.c6
-rw-r--r--src/lib/elementary/elm_widget.eo5
-rw-r--r--src/lib/elementary/elm_widget.h2
-rw-r--r--src/modules/elementary/prefs/elm_entry.c2
14 files changed, 34 insertions, 31 deletions
diff --git a/src/lib/elementary/efl_ui_layout.c b/src/lib/elementary/efl_ui_layout.c
index 60e9aa468c..55035d5eb4 100644
--- a/src/lib/elementary/efl_ui_layout.c
+++ b/src/lib/elementary/efl_ui_layout.c
@@ -396,7 +396,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
396 { 396 {
397 elm_layout_signal_emit(obj, "elm,action,focus", "elm"); 397 elm_layout_signal_emit(obj, "elm,action,focus", "elm");
398 evas_object_focus_set(wd->resize_obj, EINA_TRUE); 398 evas_object_focus_set(wd->resize_obj, EINA_TRUE);
399 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 399 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
400 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 400 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
401 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); 401 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
402 } 402 }
@@ -404,7 +404,7 @@ _efl_ui_layout_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Layout_Data *_pd EINA_
404 { 404 {
405 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm"); 405 elm_layout_signal_emit(obj, "elm,action,unfocus", "elm");
406 evas_object_focus_set(wd->resize_obj, EINA_FALSE); 406 evas_object_focus_set(wd->resize_obj, EINA_FALSE);
407 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 407 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
408 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj)) 408 if (_elm_config->atspi_mode && !elm_widget_child_can_focus_get(obj))
409 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); 409 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
410 } 410 }
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 3fe012986b..505181a9ee 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -1211,7 +1211,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
1211 1211
1212 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand) 1212 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand)
1213 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1213 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1214 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 1214 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
1215 if (_elm_config->atspi_mode) 1215 if (_elm_config->atspi_mode)
1216 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); 1216 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
1217 _return_key_enabled_check(obj); 1217 _return_key_enabled_check(obj);
@@ -1228,7 +1228,7 @@ _efl_ui_text_elm_widget_on_focus_update(Eo *obj, Efl_Ui_Text_Data *sd, Elm_Objec
1228 1228
1229 if (top && top_is_win && sd->input_panel_enable) 1229 if (top && top_is_win && sd->input_panel_enable)
1230 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1230 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1231 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 1231 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
1232 if (_elm_config->atspi_mode) 1232 if (_elm_config->atspi_mode)
1233 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); 1233 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
1234 1234
diff --git a/src/lib/elementary/elc_fileselector.c b/src/lib/elementary/elc_fileselector.c
index 29fc64768e..5e4e93a9da 100644
--- a/src/lib/elementary/elc_fileselector.c
+++ b/src/lib/elementary/elc_fileselector.c
@@ -1967,9 +1967,9 @@ _elm_fileselector_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Data *pri
1967 efl_event_callback_add 1967 efl_event_callback_add
1968 (en, ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj); 1968 (en, ELM_ENTRY_EVENT_ANCHOR_CLICKED, _anchor_clicked, obj);
1969 efl_event_callback_add 1969 efl_event_callback_add
1970 (en, ELM_WIDGET_EVENT_FOCUSED, _on_text_focused, obj); 1970 (en, EFL_UI_WIDGET_EVENT_FOCUSED, _on_text_focused, obj);
1971 efl_event_callback_add 1971 efl_event_callback_add
1972 (en, ELM_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj); 1972 (en, EFL_UI_WIDGET_EVENT_UNFOCUSED, _on_text_unfocused, obj);
1973 efl_event_callback_add 1973 efl_event_callback_add
1974 (en, ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj); 1974 (en, ELM_ENTRY_EVENT_ACTIVATED, _on_text_activated, obj);
1975 1975
diff --git a/src/lib/elementary/elc_fileselector_entry.c b/src/lib/elementary/elc_fileselector_entry.c
index 361872ce88..f6c6fec54c 100644
--- a/src/lib/elementary/elc_fileselector_entry.c
+++ b/src/lib/elementary/elc_fileselector_entry.c
@@ -57,8 +57,8 @@ SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
57SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED) 57SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED)
58SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED) 58SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED)
59SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE) 59SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE)
60SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED) 60SIG_FWD(FOCUSED, EFL_UI_WIDGET_EVENT_FOCUSED)
61SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED) 61SIG_FWD(UNFOCUSED, EFL_UI_WIDGET_EVENT_UNFOCUSED)
62SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE) 62SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE)
63SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY) 63SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY)
64SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT) 64SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT)
@@ -298,8 +298,8 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
298 SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED); 298 SIG_FWD(LONGPRESSED, EFL_UI_EVENT_LONGPRESSED);
299 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED); 299 SIG_FWD(CLICKED, EFL_UI_EVENT_CLICKED);
300 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE); 300 SIG_FWD(CLICKED_DOUBLE, EFL_UI_EVENT_CLICKED_DOUBLE);
301 SIG_FWD(FOCUSED, ELM_WIDGET_EVENT_FOCUSED); 301 SIG_FWD(FOCUSED, EFL_UI_WIDGET_EVENT_FOCUSED);
302 SIG_FWD(UNFOCUSED, ELM_WIDGET_EVENT_UNFOCUSED); 302 SIG_FWD(UNFOCUSED, EFL_UI_WIDGET_EVENT_UNFOCUSED);
303 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE); 303 SIG_FWD(SELECTION_PASTE, EFL_UI_EVENT_SELECTION_PASTE);
304 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY); 304 SIG_FWD(SELECTION_COPY, EFL_UI_EVENT_SELECTION_COPY);
305 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT); 305 SIG_FWD(SELECTION_CUT, EFL_UI_EVENT_SELECTION_CUT);
diff --git a/src/lib/elementary/elc_hoversel.c b/src/lib/elementary/elc_hoversel.c
index 510a12b8a1..a81212ccbe 100644
--- a/src/lib/elementary/elc_hoversel.c
+++ b/src/lib/elementary/elc_hoversel.c
@@ -865,8 +865,8 @@ _elm_hoversel_item_add(Eo *obj, Elm_Hoversel_Data *sd, const char *label, const
865 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0); 865 evas_object_size_hint_weight_set(bt, EVAS_HINT_EXPAND, 0.0);
866 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL); 866 evas_object_size_hint_align_set(bt, EVAS_HINT_FILL, EVAS_HINT_FILL);
867 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item); 867 efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_item_clicked, item);
868 efl_event_callback_add(bt, ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, item); 868 efl_event_callback_add(bt, EFL_UI_WIDGET_EVENT_FOCUSED, _item_focused_cb, item);
869 efl_event_callback_add(bt, ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item); 869 efl_event_callback_add(bt, EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, item);
870 870
871 sd->items = eina_list_append(sd->items, eo_item); 871 sd->items = eina_list_append(sd->items, eo_item);
872 872
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index bb82ed6c12..019b96aa6a 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -59,8 +59,8 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
59 59
60EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, 60EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
61 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, 61 { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
62 { ELM_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb }, 62 { EFL_UI_WIDGET_EVENT_FOCUSED, _entry_focus_in_cb },
63 { ELM_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb }, 63 { EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_focus_out_cb },
64 { EFL_UI_EVENT_CLICKED, _entry_clicked_cb } 64 { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
65); 65);
66 66
@@ -370,7 +370,7 @@ _elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_D
370 } 370 }
371 } 371 }
372 efl_event_callback_legacy_call 372 efl_event_callback_legacy_call
373 (obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 373 (obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
374 } 374 }
375 else 375 else
376 { 376 {
@@ -387,7 +387,7 @@ _elm_multibuttonentry_elm_widget_on_focus_update(Eo *obj, Elm_Multibuttonentry_D
387 elm_layout_signal_emit(VIEW(sd->selected_it), "elm,state,unfocused", "elm"); 387 elm_layout_signal_emit(VIEW(sd->selected_it), "elm,state,unfocused", "elm");
388 388
389 efl_event_callback_legacy_call 389 efl_event_callback_legacy_call
390 (obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 390 (obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
391 } 391 }
392 392
393end: 393end:
diff --git a/src/lib/elementary/elc_popup.c b/src/lib/elementary/elc_popup.c
index bd88611b38..fa2a625184 100644
--- a/src/lib/elementary/elc_popup.c
+++ b/src/lib/elementary/elc_popup.c
@@ -939,9 +939,9 @@ _item_new(Elm_Popup_Item_Data *it)
939 _item_select_cb, it); 939 _item_select_cb, it);
940 evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL); 940 evas_object_size_hint_align_set(VIEW(it), EVAS_HINT_FILL, EVAS_HINT_FILL);
941 efl_event_callback_add 941 efl_event_callback_add
942 (VIEW(it), ELM_WIDGET_EVENT_FOCUSED, _item_focused_cb, it); 942 (VIEW(it), EFL_UI_WIDGET_EVENT_FOCUSED, _item_focused_cb, it);
943 efl_event_callback_add 943 efl_event_callback_add
944 (VIEW(it), ELM_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it); 944 (VIEW(it), EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_unfocused_cb, it);
945 evas_object_show(VIEW(it)); 945 evas_object_show(VIEW(it));
946 } 946 }
947} 947}
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index 3ebe26cf20..da8782a3ed 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -1265,7 +1265,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
1265 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand && 1265 if (top && top_is_win && sd->input_panel_enable && !sd->input_panel_show_on_demand &&
1266 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1266 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1267 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON); 1267 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_ON);
1268 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_FOCUSED, NULL); 1268 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_FOCUSED, NULL);
1269 if (_elm_config->atspi_mode) 1269 if (_elm_config->atspi_mode)
1270 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE); 1270 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_TRUE);
1271 _return_key_enabled_check(obj); 1271 _return_key_enabled_check(obj);
@@ -1280,7 +1280,7 @@ _elm_entry_focus_update(Eo *obj, Elm_Entry_Data *sd)
1280 if (top && top_is_win && sd->input_panel_enable && 1280 if (top && top_is_win && sd->input_panel_enable &&
1281 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text")) 1281 !edje_object_part_text_imf_context_get(sd->entry_edje, "elm.text"))
1282 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF); 1282 elm_win_keyboard_mode_set(top, ELM_WIN_KEYBOARD_OFF);
1283 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_UNFOCUSED, NULL); 1283 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, NULL);
1284 if (_elm_config->atspi_mode) 1284 if (_elm_config->atspi_mode)
1285 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE); 1285 efl_access_state_changed_signal_emit(obj, EFL_ACCESS_STATE_FOCUSED, EINA_FALSE);
1286 1286
diff --git a/src/lib/elementary/elm_gengrid.c b/src/lib/elementary/elm_gengrid.c
index 7caad5170f..a60cea8c90 100644
--- a/src/lib/elementary/elm_gengrid.c
+++ b/src/lib/elementary/elm_gengrid.c
@@ -1273,7 +1273,7 @@ _item_mouse_up_cb(void *data,
1273 (sd->reorder_it)) 1273 (sd->reorder_it))
1274 { 1274 {
1275 efl_event_callback_legacy_call 1275 efl_event_callback_legacy_call
1276 (WIDGET(it), ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it)); 1276 (WIDGET(it), EFL_UI_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder_it));
1277 sd->reorder_it = NULL; 1277 sd->reorder_it = NULL;
1278 sd->move_effect_enabled = EINA_FALSE; 1278 sd->move_effect_enabled = EINA_FALSE;
1279 ecore_job_del(sd->calc_job); 1279 ecore_job_del(sd->calc_job);
@@ -2835,7 +2835,7 @@ _item_move_cb(void *data, double pos)
2835 efl_event_callback_legacy_call 2835 efl_event_callback_legacy_call
2836 (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1)); 2836 (sd->obj, ELM_GENGRID_EVENT_ITEM_REORDER_ANIM_STOP, EO_OBJ(sd->reorder.it1));
2837 efl_event_callback_legacy_call 2837 efl_event_callback_legacy_call
2838 (sd->obj, ELM_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1)); 2838 (sd->obj, EFL_UI_WIDGET_EVENT_MOVED, EO_OBJ(sd->reorder.it1));
2839 sd->reorder.running = EINA_FALSE; 2839 sd->reorder.running = EINA_FALSE;
2840 } 2840 }
2841 _elm_widget_focus_highlight_start(sd->obj); 2841 _elm_widget_focus_highlight_start(sd->obj);
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index 8df4b3db95..69f8244cda 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -408,7 +408,7 @@ _entry_value_apply(Evas_Object *obj)
408 if (!sd->entry_visible) return; 408 if (!sd->entry_visible) return;
409 409
410 efl_event_callback_del 410 efl_event_callback_del
411 (sd->ent, ELM_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj); 411 (sd->ent, EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
412 _entry_hide(obj); 412 _entry_hide(obj);
413 str = elm_object_text_get(sd->ent); 413 str = elm_object_text_get(sd->ent);
414 if (!str) return; 414 if (!str) return;
@@ -647,7 +647,7 @@ _toggle_entry(Evas_Object *obj)
647 } 647 }
648 648
649 efl_event_callback_add 649 efl_event_callback_add
650 (sd->ent, ELM_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj); 650 (sd->ent, EFL_UI_WIDGET_EVENT_UNFOCUSED, _entry_unfocused_cb, obj);
651 sd->entry_visible = EINA_TRUE; 651 sd->entry_visible = EINA_TRUE;
652 elm_layout_signal_emit(obj, "elm,state,entry,active", "elm"); 652 elm_layout_signal_emit(obj, "elm,state,entry,active", "elm");
653 evas_object_show(sd->ent); 653 evas_object_show(sd->ent);
@@ -1214,7 +1214,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
1214 efl_event_callback_add 1214 efl_event_callback_add
1215 (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj); 1215 (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
1216 efl_event_callback_add 1216 efl_event_callback_add
1217 (priv->text_button, ELM_WIDGET_EVENT_FOCUSED, _text_button_focused_cb, obj); 1217 (priv->text_button, EFL_UI_WIDGET_EVENT_FOCUSED, _text_button_focused_cb, obj);
1218 1218
1219 elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button); 1219 elm_layout_content_set(obj, "elm.swallow.text_button", priv->text_button);
1220 elm_widget_sub_object_add(obj, priv->text_button); 1220 elm_widget_sub_object_add(obj, priv->text_button);
diff --git a/src/lib/elementary/elm_widget.c b/src/lib/elementary/elm_widget.c
index fae4803982..bea9f132ce 100644
--- a/src/lib/elementary/elm_widget.c
+++ b/src/lib/elementary/elm_widget.c
@@ -1174,7 +1174,7 @@ elm_widget_access(Evas_Object *obj,
1174 } 1174 }
1175 1175
1176 efl_ui_widget_on_access_update(obj, is_access); 1176 efl_ui_widget_on_access_update(obj, is_access);
1177 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_ACCESS_CHANGED, NULL); 1177 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_ACCESS_CHANGED, NULL);
1178 1178
1179 return ret; 1179 return ret;
1180} 1180}
@@ -2930,7 +2930,7 @@ _elm_widget_efl_ui_translatable_translation_update(Eo *obj EINA_UNUSED, Elm_Widg
2930 sd->on_translate = EINA_FALSE; 2930 sd->on_translate = EINA_FALSE;
2931 } 2931 }
2932#endif 2932#endif
2933 efl_event_callback_legacy_call(obj, ELM_WIDGET_EVENT_LANGUAGE_CHANGED, NULL); 2933 efl_event_callback_legacy_call(obj, EFL_UI_WIDGET_EVENT_LANGUAGE_CHANGED, NULL);
2934} 2934}
2935 2935
2936EOLIAN static void 2936EOLIAN static void
@@ -5191,7 +5191,7 @@ _elm_widget_on_focus_update(Eo *obj, Elm_Widget_Smart_Data *sd, Elm_Object_Item
5191 return EINA_FALSE; 5191 return EINA_FALSE;
5192 5192
5193 focused = elm_widget_focus_get(obj); 5193 focused = elm_widget_focus_get(obj);
5194 desc = focused ? ELM_WIDGET_EVENT_FOCUSED : ELM_WIDGET_EVENT_UNFOCUSED; 5194 desc = focused ? EFL_UI_WIDGET_EVENT_FOCUSED : EFL_UI_WIDGET_EVENT_UNFOCUSED;
5195 5195
5196 if (!sd->resize_obj) 5196 if (!sd->resize_obj)
5197 evas_object_focus_set(obj, focused); 5197 evas_object_focus_set(obj, focused);
diff --git a/src/lib/elementary/elm_widget.eo b/src/lib/elementary/elm_widget.eo
index b46c4f5801..33c74cc8d0 100644
--- a/src/lib/elementary/elm_widget.eo
+++ b/src/lib/elementary/elm_widget.eo
@@ -17,6 +17,7 @@ struct Elm.Widget.Focus_State {
17 logical : bool; [[$true if this is registered as logical currently]] 17 logical : bool; [[$true if this is registered as logical currently]]
18} 18}
19 19
20/* ATTENTION: Rename to Efl.Ui.Widget is imminent. */
20abstract Elm.Widget (Efl.Canvas.Group, Efl.Access, 21abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
21 Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part, 22 Efl.Access.Component, Efl.Ui.Focus.User, Efl.Part,
22 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor, 23 Efl.Ui.Focus.Object, Efl.Ui.Base, Efl.Ui.Cursor,
@@ -25,8 +26,8 @@ abstract Elm.Widget (Efl.Canvas.Group, Efl.Access,
25 [[Elementary widget abstract class]] 26 [[Elementary widget abstract class]]
26 legacy_prefix: elm_widget; 27 legacy_prefix: elm_widget;
27 eo_prefix: efl_ui_widget; 28 eo_prefix: efl_ui_widget;
28 event_prefix: elm_widget; 29 event_prefix: efl_ui_widget;
29 data: Elm_Widget_Smart_Data; 30 data: Efl_Ui_Widget_Data;
30 methods { 31 methods {
31 @property resize_object @protected { 32 @property resize_object @protected {
32 [[This is the internal canvas object managed by a widget. 33 [[This is the internal canvas object managed by a widget.
diff --git a/src/lib/elementary/elm_widget.h b/src/lib/elementary/elm_widget.h
index fd607c7995..82e17bc76d 100644
--- a/src/lib/elementary/elm_widget.h
+++ b/src/lib/elementary/elm_widget.h
@@ -462,6 +462,8 @@ typedef struct _Elm_Widget_Smart_Data
462 Eina_Bool legacy : 1; /**< Widget was created with a legacy API, not efl_add() */ 462 Eina_Bool legacy : 1; /**< Widget was created with a legacy API, not efl_add() */
463} Elm_Widget_Smart_Data; 463} Elm_Widget_Smart_Data;
464 464
465typedef Elm_Widget_Smart_Data Efl_Ui_Widget_Data;
466
465/** 467/**
466 * @} 468 * @}
467 */ 469 */
diff --git a/src/modules/elementary/prefs/elm_entry.c b/src/modules/elementary/prefs/elm_entry.c
index a146ecbb9c..e87fe33e73 100644
--- a/src/modules/elementary/prefs/elm_entry.c
+++ b/src/modules/elementary/prefs/elm_entry.c
@@ -159,7 +159,7 @@ elm_prefs_entry_add(const Elm_Prefs_Item_Iface *iface EINA_UNUSED,
159 efl_event_callback_add 159 efl_event_callback_add
160 (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb); 160 (obj, ELM_ENTRY_EVENT_ACTIVATED, _item_changed_cb, cb);
161 efl_event_callback_add 161 efl_event_callback_add
162 (obj, ELM_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb); 162 (obj, EFL_UI_WIDGET_EVENT_UNFOCUSED, _item_changed_cb, cb);
163 if (spec.s.accept) 163 if (spec.s.accept)
164 { 164 {
165 int ret; 165 int ret;