aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2019-07-28 22:46:18 +0000
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-29 08:39:23 +0200
commit6b26b2ab00eec30caf915b79d4be29c0f5fbcc05 (patch)
treef50da1eada65a948147a62ede0cc815e66105784
parenteina file - stat generation inexactness support (diff)
downloadefl-devs/bu5hm4n/work_travis.tar.gz
efl_input_clickable: rename efl_ui_clickable to efl_input_clickabledevs/bu5hm4n/work_travis
Renamed all efl_ui_clickable_XXX to efl_input_clickable_XXX based on the discussion in https://phab.enlightenment.org/T7847 ref https://phab.enlightenment.org/T7847 https://phab.enlightenment.org/T7976 Differential Revision: https://phab.enlightenment.org/D9427
-rw-r--r--src/bin/elementary/test_bg.c4
-rw-r--r--src/bin/elementary/test_efl_ui_text.c10
-rw-r--r--src/bin/elementary/test_evas_mask.c6
-rw-r--r--src/bin/elementary/test_evas_snapshot.c8
-rw-r--r--src/bin/elementary/test_events.c4
-rw-r--r--src/bin/elementary/test_gfx_filters.c4
-rw-r--r--src/bin/elementary/test_part_bg.c6
-rw-r--r--src/bin/elementary/test_part_shadow.c4
-rw-r--r--src/bin/elementary/test_photocam.c2
-rw-r--r--src/bin/elementary/test_ui_button.c18
-rw-r--r--src/bin/elementary/test_ui_clock.c2
-rw-r--r--src/bin/elementary/test_ui_image.c4
-rw-r--r--src/bin/elementary/test_ui_item_container.c12
-rw-r--r--src/bin/elementary/test_ui_pager.c32
-rw-r--r--src/bin/elementary/test_ui_pager_scroll.c40
-rw-r--r--src/bin/elementary/test_ui_panel.c2
-rw-r--r--src/bin/elementary/test_ui_popup.c82
-rw-r--r--src/bin/elementary/test_ui_progressbar.c6
-rw-r--r--src/bin/elementary/test_ui_radio.c6
-rw-r--r--src/bin/elementary/test_ui_relative_layout.c4
-rw-r--r--src/bin/elementary/test_ui_scroller.c16
-rw-r--r--src/bin/elementary/test_ui_spin.c4
-rw-r--r--src/bin/elementary/test_ui_spotlight.c44
-rw-r--r--src/bin/elementary/test_ui_stack.c12
-rw-r--r--src/bin/elementary/test_ui_tab_pager.c38
-rw-r--r--src/bin/elementary/test_ui_table.c12
-rw-r--r--src/bin/elementary/test_ui_table_static.c4
-rw-r--r--src/bin/elementary/test_ui_tags.c2
-rw-r--r--src/bin/elementary/test_win_indicator.c8
-rw-r--r--src/examples/elementary/button_cxx_example_00.cc4
-rw-r--r--src/examples/elementary/button_cxx_example_01.cc20
-rw-r--r--src/examples/elementary/efl_ui_list_example_1.c10
-rw-r--r--src/examples/elementary/efl_ui_slideshow_example.c2
-rw-r--r--src/examples/elementary/efl_ui_theme_example_01.c2
-rw-r--r--src/examples/elementary/efl_ui_theme_example_02.c2
-rw-r--r--src/examples/elementary/popup_cxx_example.cc26
-rw-r--r--src/lib/elementary/Efl_Ui.h1
-rw-r--r--src/lib/elementary/Elementary.h1
-rw-r--r--src/lib/elementary/efl_ui_alert_popup.c6
-rw-r--r--src/lib/elementary/efl_ui_button.c10
-rw-r--r--src/lib/elementary/efl_ui_button.eo2
-rw-r--r--src/lib/elementary/efl_ui_calendar.c2
-rw-r--r--src/lib/elementary/efl_ui_clickable_util.c24
-rw-r--r--src/lib/elementary/efl_ui_clickable_util.eo12
-rw-r--r--src/lib/elementary/efl_ui_collection.c20
-rw-r--r--src/lib/elementary/efl_ui_frame.c4
-rw-r--r--src/lib/elementary/efl_ui_frame.eo2
-rw-r--r--src/lib/elementary/efl_ui_image.c4
-rw-r--r--src/lib/elementary/efl_ui_image.eo2
-rw-r--r--src/lib/elementary/efl_ui_image_zoomable.c2
-rw-r--r--src/lib/elementary/efl_ui_item.c8
-rw-r--r--src/lib/elementary/efl_ui_item.eo2
-rw-r--r--src/lib/elementary/efl_ui_navigation_bar.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.c6
-rw-r--r--src/lib/elementary/efl_ui_panes.eo2
-rw-r--r--src/lib/elementary/efl_ui_spin_button.c2
-rw-r--r--src/lib/elementary/efl_ui_tags.c4
-rw-r--r--src/lib/elementary/efl_ui_text.c6
-rw-r--r--src/lib/elementary/efl_ui_text.eo2
-rw-r--r--src/lib/elementary/efl_ui_timepicker.c2
-rw-r--r--src/lib/elementary/elc_multibuttonentry.c2
-rw-r--r--src/lib/elementary/elc_naviframe.c2
-rw-r--r--src/lib/elementary/elm_bubble_eo.c2
-rw-r--r--src/lib/elementary/elm_calendar.c6
-rw-r--r--src/lib/elementary/elm_color_class.c2
-rw-r--r--src/lib/elementary/elm_colorselector.c4
-rw-r--r--src/lib/elementary/elm_colorselector_eo.c2
-rw-r--r--src/lib/elementary/elm_diskselector_eo.c2
-rw-r--r--src/lib/elementary/elm_entry.c2
-rw-r--r--src/lib/elementary/elm_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_entry_eo.c2
-rw-r--r--src/lib/elementary/elm_fileselector_eo.c2
-rw-r--r--src/lib/elementary/elm_gengrid_eo.c2
-rw-r--r--src/lib/elementary/elm_genlist_eo.c2
-rw-r--r--src/lib/elementary/elm_hover_eo.c2
-rw-r--r--src/lib/elementary/elm_hoversel_eo.c2
-rw-r--r--src/lib/elementary/elm_index_eo.c2
-rw-r--r--src/lib/elementary/elm_list_eo.c2
-rw-r--r--src/lib/elementary/elm_map_eo.c2
-rw-r--r--src/lib/elementary/elm_menu.c4
-rw-r--r--src/lib/elementary/elm_menu_eo.c2
-rw-r--r--src/lib/elementary/elm_multibuttonentry_eo.c2
-rw-r--r--src/lib/elementary/elm_photo_eo.c2
-rw-r--r--src/lib/elementary/elm_plug_eo.c2
-rw-r--r--src/lib/elementary/elm_spinner.c8
-rw-r--r--src/lib/elementary/elm_thumb_eo.c2
-rw-r--r--src/lib/elementary/elm_toolbar_eo.c2
-rw-r--r--src/lib/elementary/meson.build2
-rw-r--r--src/lib/evas/Evas_Eo.h1
-rw-r--r--src/lib/evas/canvas/efl_input_clickable.c (renamed from src/lib/elementary/efl_ui_clickable.c)33
-rw-r--r--src/lib/evas/canvas/efl_input_clickable.eo (renamed from src/lib/elementary/efl_ui_clickable.eo)12
-rw-r--r--src/lib/evas/canvas/meson.build2
-rw-r--r--src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c4
-rw-r--r--src/tests/elementary/spec/efl_test_clickable.c24
94 files changed, 370 insertions, 370 deletions
diff --git a/src/bin/elementary/test_bg.c b/src/bin/elementary/test_bg.c
index fb8b4f5f33..ebcb3ded07 100644
--- a/src/bin/elementary/test_bg.c
+++ b/src/bin/elementary/test_bg.c
@@ -358,7 +358,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _file_cb, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _file_cb, win),
efl_pack(box, efl_added));
snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get());
@@ -366,7 +366,7 @@ test_bg_window(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _image_cb, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _image_cb, win),
efl_pack(box, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
diff --git a/src/bin/elementary/test_efl_ui_text.c b/src/bin/elementary/test_efl_ui_text.c
index 9993204468..a939304965 100644
--- a/src/bin/elementary/test_efl_ui_text.c
+++ b/src/bin/elementary/test_efl_ui_text.c
@@ -184,14 +184,14 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Sel");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt3_clicked, en);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt3_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Wr");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_bt6_clicked, en);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_bt6_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
@@ -376,21 +376,21 @@ test_ui_text_item_factory(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Image");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_image_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Emoticon");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_emoticon_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Factory");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _on_factory_bt_factory_clicked, en);
efl_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE);
diff --git a/src/bin/elementary/test_evas_mask.c b/src/bin/elementary/test_evas_mask.c
index 5b470e0845..4a263e0a44 100644
--- a/src/bin/elementary/test_evas_mask.c
+++ b/src/bin/elementary/test_evas_mask.c
@@ -182,19 +182,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
// FIXME: button EO API
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle mask (image)"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_mask, ly),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_mask, ly),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle map"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, ly),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, ly),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Rotate Window"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _rotate_win, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _rotate_win, win),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added));
diff --git a/src/bin/elementary/test_evas_snapshot.c b/src/bin/elementary/test_evas_snapshot.c
index 4cb8ed1b53..dba6570588 100644
--- a/src/bin/elementary/test_evas_snapshot.c
+++ b/src/bin/elementary/test_evas_snapshot.c
@@ -184,25 +184,25 @@ test_evas_snapshot(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_text_set(efl_added, "Toggle animation"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _anim_toggle, win));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _anim_toggle, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Save to file"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _save_image, win));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _save_image, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Map"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _toggle_map, win));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _toggle_map, win));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Close"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _close_do, win));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _close_do, win));
efl_key_wref_set(win, "snap", snap);
efl_key_wref_set(win, "table", table);
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c
index 614b9fa2ac..4b36bf4b35 100644
--- a/src/bin/elementary/test_events.c
+++ b/src/bin/elementary/test_events.c
@@ -227,9 +227,9 @@ test_events(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_in
o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_pack(bx, o);
- efl_event_callback_add(td->button, EFL_UI_EVENT_CLICKED, _clicked_button1, td);
+ efl_event_callback_add(td->button, EFL_INPUT_EVENT_CLICKED, _clicked_button1, td);
efl_event_callback_array_add(td->button, button_pointer_callbacks(), (void*)(intptr_t)0x1);
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _clicked_button2, td);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _clicked_button2, td);
efl_event_callback_add(win, EFL_EVENT_DEL, _win_del, td);
efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
efl_event_callback_array_add(win, win_key_callbacks(), td);
diff --git a/src/bin/elementary/test_gfx_filters.c b/src/bin/elementary/test_gfx_filters.c
index fed75a9359..4fdee9dccb 100644
--- a/src/bin/elementary/test_gfx_filters.c
+++ b/src/bin/elementary/test_gfx_filters.c
@@ -378,7 +378,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_text_set(efl_added, "Flip"),
efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _flip_click, win));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _flip_click, win));
efl_pack(box2, o);
}
@@ -409,7 +409,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
elm_object_tooltip_text_set(efl_added, images[k].src_name));
if (efl_player_playable_get(o))
efl_player_play_set(o, 1);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _img_click, win);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _img_click, win);
efl_pack(box2, o);
}
diff --git a/src/bin/elementary/test_part_bg.c b/src/bin/elementary/test_part_bg.c
index cc01014c04..d3d6ea3629 100644
--- a/src/bin/elementary/test_part_bg.c
+++ b/src/bin/elementary/test_part_bg.c
@@ -181,9 +181,9 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
radio_group = _create_box_contents(vbox);
- efl_event_callback_add(reset_btn, EFL_UI_EVENT_CLICKED, _reset_cb, radio_group);
- efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group);
- efl_event_callback_add(scale_btn, EFL_UI_EVENT_CLICKED, _scale_type_cb, radio_group);
+ efl_event_callback_add(reset_btn, EFL_INPUT_EVENT_CLICKED, _reset_cb, radio_group);
+ efl_event_callback_add(color_btn, EFL_INPUT_EVENT_CLICKED, _color_cb, radio_group);
+ efl_event_callback_add(scale_btn, EFL_INPUT_EVENT_CLICKED, _scale_type_cb, radio_group);
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
}
diff --git a/src/bin/elementary/test_part_shadow.c b/src/bin/elementary/test_part_shadow.c
index 44e75143c9..8378473903 100644
--- a/src/bin/elementary/test_part_shadow.c
+++ b/src/bin/elementary/test_part_shadow.c
@@ -181,12 +181,12 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_pack(bx, bt_bx);
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start"));
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_start, td);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_start, td);
efl_pack(bt_bx, bt);
td->btn_start = bt;
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop"));
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, pulse_stop, td);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, pulse_stop, td);
efl_ui_widget_disabled_set(bt, EINA_TRUE);
efl_pack(bt_bx, bt);
td->btn_stop = bt;
diff --git a/src/bin/elementary/test_photocam.c b/src/bin/elementary/test_photocam.c
index bbbbb1fe88..42ef33f671 100644
--- a/src/bin/elementary/test_photocam.c
+++ b/src/bin/elementary/test_photocam.c
@@ -827,7 +827,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_file_set(efl_added, buf),
efl_file_load(efl_added),
efl_pack(bx, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _zoomable_clicked_cb, NULL)
);
if (efl_player_playable_get(zoomable))
diff --git a/src/bin/elementary/test_ui_button.c b/src/bin/elementary/test_ui_button.c
index 079f9c66d3..62be0bca4f 100644
--- a/src/bin/elementary/test_ui_button.c
+++ b/src/bin/elementary/test_ui_button.c
@@ -42,18 +42,18 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text"),
efl_pack(bx, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
// Icon Only Button
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_pack(bx, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf),
@@ -65,9 +65,9 @@ test_ui_button(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text + Icon"),
efl_pack(bx, efl_added),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_UNPRESSED, _unpressed, NULL)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_PRESSED, _pressed, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_UNPRESSED, _unpressed, NULL)
);
efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf),
diff --git a/src/bin/elementary/test_ui_clock.c b/src/bin/elementary/test_ui_clock.c
index 936efd1d3b..d8cfd175e1 100644
--- a/src/bin/elementary/test_ui_clock.c
+++ b/src/bin/elementary/test_ui_clock.c
@@ -102,6 +102,6 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Back to the future..."),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
diff --git a/src/bin/elementary/test_ui_image.c b/src/bin/elementary/test_ui_image.c
index 8491a7f4cd..482abe6d8d 100644
--- a/src/bin/elementary/test_ui_image.c
+++ b/src/bin/elementary/test_ui_image.c
@@ -573,13 +573,13 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
{
bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Reload"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _reload_clicked, win)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _reload_clicked, win)
);
efl_pack(hbox, bt);
bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Switch"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _switch_clicked, win)
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _switch_clicked, win)
);
efl_pack(hbox, bt);
}
diff --git a/src/bin/elementary/test_ui_item_container.c b/src/bin/elementary/test_ui_item_container.c
index 97f3f0797b..e87a6ba9a7 100644
--- a/src/bin/elementary/test_ui_item_container.c
+++ b/src/bin/elementary/test_ui_item_container.c
@@ -175,21 +175,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 1154 ANIMATED");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_animated_cb, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_animated_cb, item_container);
efl_pack_table(tbl, o, 0, 1, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 10");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _scroll_to_cb, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _scroll_to_cb, item_container);
efl_pack_table(tbl, o, 0, 2, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Change min size of 0");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _change_min_size_cb, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _change_min_size_cb, item_container);
efl_pack_table(tbl, o, 0, 3, 1, 1);
o = efl_add(EFL_UI_CHECK_CLASS, tbl,
@@ -221,21 +221,21 @@ void create_item_container_ui(Efl_Ui_Position_Manager_Entity *manager, const Efl
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Remove all items");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _remove_all_cb, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _remove_all_cb, item_container);
efl_pack_table(tbl, o, 0, 7, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1 item");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_one_item, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_one_item, item_container);
efl_pack_table(tbl, o, 0, 8, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1000 item");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _add_thousend_items, item_container);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _add_thousend_items, item_container);
efl_pack_table(tbl, o, 0, 9, 1, 1);
bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl,
diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c
index 6fcf48f763..c6d1aa084b 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -337,7 +337,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -439,7 +439,7 @@ static void pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -478,7 +478,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -496,7 +496,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -514,7 +514,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -532,7 +532,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -550,7 +550,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -569,7 +569,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@@ -603,7 +603,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -624,7 +624,7 @@ static void current_page_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -656,7 +656,7 @@ static void current_page_cb(void *data,
psp->pager = pager;
psp->spinner = sp;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@@ -670,7 +670,7 @@ static void indicator_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -680,13 +680,13 @@ static void indicator_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@@ -735,13 +735,13 @@ void test_ui_pager(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, prev_btn_cb, pager),
+ EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, next_btn_cb, pager),
+ EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
diff --git a/src/bin/elementary/test_ui_pager_scroll.c b/src/bin/elementary/test_ui_pager_scroll.c
index 6e6c7d1f49..a7e564acbd 100644
--- a/src/bin/elementary/test_ui_pager_scroll.c
+++ b/src/bin/elementary/test_ui_pager_scroll.c
@@ -391,7 +391,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -491,7 +491,7 @@ static void padding_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -518,7 +518,7 @@ static void side_page_num_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -551,7 +551,7 @@ static void pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -590,7 +590,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -608,7 +608,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -626,7 +626,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -644,7 +644,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -662,7 +662,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -681,7 +681,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@@ -715,7 +715,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -735,7 +735,7 @@ static void current_page_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -767,7 +767,7 @@ static void current_page_cb(void *data,
psp->pager = pager;
psp->spinner = sp;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@@ -783,7 +783,7 @@ static void scroll_block_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -822,7 +822,7 @@ static void loop_cb(void *data EINA_UNUSED,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_RADIO_BOX_CLASS, navi,
@@ -870,7 +870,7 @@ static void indicator_cb(void *data EINA_UNUSED,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -880,13 +880,13 @@ static void indicator_cb(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@@ -936,13 +936,13 @@ void test_ui_pager_scroll(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, prev_btn_cb, pager),
+ EFL_INPUT_EVENT_CLICKED, prev_btn_cb, pager),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, next_btn_cb, pager),
+ EFL_INPUT_EVENT_CLICKED, next_btn_cb, pager),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager,
diff --git a/src/bin/elementary/test_ui_panel.c b/src/bin/elementary/test_ui_panel.c
index 22bd1a6ad4..ac08ff878a 100644
--- a/src/bin/elementary/test_ui_panel.c
+++ b/src/bin/elementary/test_ui_panel.c
@@ -154,7 +154,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_content_set(panel, list);
efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check);
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _btn_clicked, panel);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _btn_clicked, panel);
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
}
diff --git a/src/bin/elementary/test_ui_popup.c b/src/bin/elementary/test_ui_popup.c
index d70592c70a..6fa397234f 100644
--- a/src/bin/elementary/test_ui_popup.c
+++ b/src/bin/elementary/test_ui_popup.c
@@ -251,7 +251,7 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_entity_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
efl_text_set(repeat_test_btn, "Repeat Event Test");
- efl_event_callback_add(repeat_test_btn, EFL_UI_EVENT_CLICKED, _repeat_test_cb, NULL);
+ efl_event_callback_add(repeat_test_btn, EFL_INPUT_EVENT_CLICKED, _repeat_test_cb, NULL);
efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
p_data->win = win;
@@ -263,73 +263,73 @@ test_ui_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_text_set(create_btn, "Create Popup");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _create_cb, p_data);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _create_cb, p_data);
Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(delete_btn, "Delete Popup");
efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(delete_btn, EFL_UI_EVENT_CLICKED, _delete_cb, p_data);
+ efl_event_callback_add(delete_btn, EFL_INPUT_EVENT_CLICKED, _delete_cb, p_data);
Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(repeat_event_btn, "Repeat Event Set");
efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(repeat_event_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(repeat_event_btn, EFL_UI_EVENT_CLICKED, _repeat_event_cb, p_data);
+ efl_event_callback_add(repeat_event_btn, EFL_INPUT_EVENT_CLICKED, _repeat_event_cb, p_data);
Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(dummy_btn, "Show Dummy Button");
efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(dummy_btn, EFL_UI_EVENT_CLICKED, _dummy_cb, p_data);
+ efl_event_callback_add(dummy_btn, EFL_INPUT_EVENT_CLICKED, _dummy_cb, p_data);
Eo *backwall_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_gfx_entity_position_set(backwall_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
efl_text_set(backwall_btn, "Backwall Set");
- efl_event_callback_add(backwall_btn, EFL_UI_EVENT_CLICKED, _backwall_cb, p_data);
+ efl_event_callback_add(backwall_btn, EFL_INPUT_EVENT_CLICKED, _backwall_cb, p_data);
Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(timeout_btn, "Timeout Set");
efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(timeout_btn, EFL_UI_EVENT_CLICKED, _timeout_set_cb, p_data);
+ efl_event_callback_add(timeout_btn, EFL_INPUT_EVENT_CLICKED, _timeout_set_cb, p_data);
Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(center_btn, "Center Align");
efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(center_btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
+ efl_event_callback_add(center_btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(top_btn, "Top Align");
efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(top_btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
+ efl_event_callback_add(top_btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(left_btn, "Left Align");
efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
+ efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(right_btn, "Right Align");
efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
+ efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(bottom_btn, "Bottom Align");
efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(bottom_btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
+ efl_event_callback_add(bottom_btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(position_btn, "Position Set (x:0, y:0)");
efl_gfx_entity_position_set(position_btn, EINA_POSITION2D(150, 250));
efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50));
- efl_event_callback_add(position_btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
+ efl_event_callback_add(position_btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
}
static void
@@ -517,31 +517,31 @@ test_ui_scroll_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(create_btn, "1. size(160,160), content(200, 200), expand(-1, -1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case1_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(160,160), content(200, 200), expand(320, -1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case2_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(160,160), content(200, 200), expand(-1, 320)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case3_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(160,160), content(200, 200), expand(320, 320)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case4_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(160,160), content(200, 200), expand(80, 80)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_scroll_case5_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_scroll_case5_cb, win);
}
static void
@@ -900,85 +900,85 @@ test_ui_text_alert_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, v
efl_text_set(create_btn, "1. size(200,200), text(short), expand(-1,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case1_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case1_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case2_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case2_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case3_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case3_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case4_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case4_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case5_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case5_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case6_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case6_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 300));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case7_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case7_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 350));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case8_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case8_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 400));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case9_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case9_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 450));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case10_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case10_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 500));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case11_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case11_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 550));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case12_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case12_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 600));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case13_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case13_cb, win);
create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 650));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50));
- efl_event_callback_add(create_btn, EFL_UI_EVENT_CLICKED, _alert_text_case14_cb, win);
+ efl_event_callback_add(create_btn, EFL_INPUT_EVENT_CLICKED, _alert_text_case14_cb, win);
}
static void
@@ -1036,7 +1036,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_set_cb, efl_ui_popup);
snprintf(buf, sizeof(buf), "anchor%d", i+1);
efl_content_set(efl_part(layout, buf), btn);
@@ -1045,7 +1045,7 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor none");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _anchor_unset_cb, efl_ui_popup);
efl_content_set(efl_part(layout, "anchor_none"), btn);
Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup);
@@ -1054,43 +1054,43 @@ test_ui_anchor_popup(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Center Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _center_align_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _center_align_cb, p_data);
efl_pack_table(table, btn, 0, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Top Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _top_align_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _top_align_cb, p_data);
efl_pack_table(table, btn, 2, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Bottom Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _bottom_align_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _bottom_align_cb, p_data);
efl_pack_table(table, btn, 4, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Left Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _left_align_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _left_align_cb, p_data);
efl_pack_table(table, btn, 0, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Right Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _right_align_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _right_align_cb, p_data);
efl_pack_table(table, btn, 3, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Position Set");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _position_set_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _position_set_cb, p_data);
efl_pack_table(table, btn, 0, 2, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Resize");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35));
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _popup_resize_cb, p_data);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _popup_resize_cb, p_data);
efl_pack_table(table, btn, 3, 2, 3, 1);
efl_content_set(efl_ui_popup, table);
diff --git a/src/bin/elementary/test_ui_progressbar.c b/src/bin/elementary/test_ui_progressbar.c
index 5a1c705a03..943c57404a 100644
--- a/src/bin/elementary/test_ui_progressbar.c
+++ b/src/bin/elementary/test_ui_progressbar.c
@@ -224,20 +224,20 @@ test_ui_progressbar(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "start"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_start_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);
pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "stop"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_stop_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);
pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "reset"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_reset_btn_clicked_cb, pd),
efl_pack(btbx, efl_added)
);
diff --git a/src/bin/elementary/test_ui_radio.c b/src/bin/elementary/test_ui_radio.c
index 7f72df92f7..c6cb3d2033 100644
--- a/src/bin/elementary/test_ui_radio.c
+++ b/src/bin/elementary/test_ui_radio.c
@@ -119,18 +119,18 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 0, 1, 1);
efl_text_set(o, "Selected France check");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2));
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _select_btn_clicked, eina_array_data_get(arr, 2));
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 1, 1, 1);
efl_text_set(o, "Set value for Germany");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_btn_clicked, bx);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_btn_clicked, bx);
o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 2, 1, 1);
efl_text_set(o, "Set object for UK");
efl_key_data_set(o, "uk", uk);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, _set_selected_object_btn_clicked, bx);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, _set_selected_object_btn_clicked, bx);
eina_array_free(arr);
}
diff --git a/src/bin/elementary/test_ui_relative_layout.c b/src/bin/elementary/test_ui_relative_layout.c
index c108dd6cf7..2632f34353 100644
--- a/src/bin/elementary/test_ui_relative_layout.c
+++ b/src/bin/elementary/test_ui_relative_layout.c
@@ -167,7 +167,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
efl_key_wref_set(efl_added, "to", to),
efl_key_wref_set(efl_added, "btn", btn),
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_clicked_to_cb, (void *)option),
efl_pack(hbox, efl_added));
efl_add(EFL_UI_SLIDER_CLASS, hbox,
@@ -308,7 +308,7 @@ test_ui_relative_layout(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, vo
btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "button1"),
efl_gfx_hint_align_set(efl_added, 0.0, 0.0),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_color_clicked_cb, layout),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_color_clicked_cb, layout),
efl_ui_relative_layout_relation_right_set(layout, efl_added, layout, 0.0),
efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));
diff --git a/src/bin/elementary/test_ui_scroller.c b/src/bin/elementary/test_ui_scroller.c
index f3b6152b2b..a042039109 100644
--- a/src/bin/elementary/test_ui_scroller.c
+++ b/src/bin/elementary/test_ui_scroller.c
@@ -60,7 +60,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
@@ -76,7 +76,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
{
efl_add(EFL_UI_BUTTON_CLASS, bx2,
efl_text_set(efl_added, "... Horizontal scrolling ..."),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx2, efl_added));
}
@@ -86,7 +86,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
@@ -114,7 +114,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
{
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Both"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(gd2, efl_added, i, j, 1, 1));
}
}
@@ -125,7 +125,7 @@ test_efl_ui_scroller(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
}
@@ -161,7 +161,7 @@ test_efl_ui_scroller_simple(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack(bx, efl_added));
}
}
@@ -197,13 +197,13 @@ test_efl_ui_scroller_simple2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(tb, efl_added, 0, i, 1, 1));
efl_add(EFL_UI_BUTTON_CLASS, tb,
efl_text_set(efl_added, "Horizontal"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _bt_clicked, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _bt_clicked, NULL),
efl_pack_table(tb, efl_added, 1, i, 1, 1));
}
}
diff --git a/src/bin/elementary/test_ui_spin.c b/src/bin/elementary/test_ui_spin.c
index f07a42778a..01b0ff38a3 100644
--- a/src/bin/elementary/test_ui_spin.c
+++ b/src/bin/elementary/test_ui_spin.c
@@ -58,12 +58,12 @@ test_ui_spin(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Increse Spinner value"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _inc_clicked, sp),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _inc_clicked, sp),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Decrease Spinner value"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _dec_clicked, sp),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _dec_clicked, sp),
efl_pack(bx, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120));
diff --git a/src/bin/elementary/test_ui_spotlight.c b/src/bin/elementary/test_ui_spotlight.c
index ff0cbdd6f5..428ea52066 100644
--- a/src/bin/elementary/test_ui_spotlight.c
+++ b/src/bin/elementary/test_ui_spotlight.c
@@ -101,7 +101,7 @@ view_add(View_Type p, Eo *parent)
case BUTTON:
page = efl_add(EFL_UI_BUTTON_CLASS, parent,
efl_text_set(efl_added, "Button Page"));
- efl_event_callback_add(page, EFL_UI_EVENT_CLICKED, page_clicked_cb, NULL);
+ efl_event_callback_add(page, EFL_INPUT_EVENT_CLICKED, page_clicked_cb, NULL);
efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
break;
@@ -370,7 +370,7 @@ spotlight_size(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -479,7 +479,7 @@ view_animation_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -508,7 +508,7 @@ pack_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -549,7 +549,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -567,7 +567,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -585,7 +585,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -603,7 +603,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -621,7 +621,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -640,7 +640,7 @@ pack_cb(void *data,
pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param);
@@ -674,7 +674,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param),
@@ -695,7 +695,7 @@ active_index_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -727,7 +727,7 @@ active_index_cb(void *data,
psp->spotlight = spotlight;
psp->spinner = sp;
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, page_set_btn_cb, psp);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, page_set_btn_cb, psp);
efl_event_callback_add(btn, EFL_EVENT_DEL, page_set_btn_del_cb, psp);
}
@@ -742,7 +742,7 @@ indicator_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
@@ -752,13 +752,13 @@ indicator_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
indicator_none_btn_cb, params),
efl_pack_end(box, efl_added));
}
@@ -810,13 +810,13 @@ test_ui_spotlight_stack(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
@@ -910,13 +910,13 @@ test_ui_spotlight_plain(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
@@ -1011,13 +1011,13 @@ test_ui_spotlight_scroll(void *data EINA_UNUSED,
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, prev_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, prev_btn_cb, spotlight),
efl_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added,
- EFL_UI_EVENT_CLICKED, next_btn_cb, spotlight),
+ EFL_INPUT_EVENT_CLICKED, next_btn_cb, spotlight),
efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params));
diff --git a/src/bin/elementary/test_ui_stack.c b/src/bin/elementary/test_ui_stack.c
index bd1c475959..854696b21c 100644
--- a/src/bin/elementary/test_ui_stack.c
+++ b/src/bin/elementary/test_ui_stack.c
@@ -70,7 +70,7 @@ _bar_left_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_text_set(left_btn, "Prev");
efl_content_set(efl_part(bn, "left_content"), left_btn);
- efl_event_callback_add(left_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
+ efl_event_callback_add(left_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
//Positions of "left_content" and "back_button" are the same.
efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE);
@@ -85,7 +85,7 @@ _bar_right_btn_set(Eo *navigation_layout, Efl_Event_Cb clicked_cb, void *data)
efl_text_set(right_btn, "Next");
efl_content_set(efl_part(bn, "right_content"), right_btn);
- efl_event_callback_add(right_btn, EFL_UI_EVENT_CLICKED, clicked_cb, data);
+ efl_event_callback_add(right_btn, EFL_INPUT_EVENT_CLICKED, clicked_cb, data);
}
static void
@@ -95,7 +95,7 @@ _fifth_layout_insert(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to remove top layout");
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_remove, stack);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_remove, stack);
Eo *nl = _navigation_layout_create(stack, "5th layout", btn);
@@ -109,7 +109,7 @@ _third_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to pop");
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_pop, stack);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_pop, stack);
Eo *nl = _navigation_layout_create(stack, "3rd layout", btn);
@@ -125,7 +125,7 @@ _second_layout_push(void *data, const Efl_Event *ev EINA_UNUSED)
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to double push");
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_double_push, stack);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_double_push, stack);
Eo *nl = _navigation_layout_create(stack, "2nd layout", btn);
@@ -139,7 +139,7 @@ _first_layout_push(Eo *win, Eo *stack)
{
Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to delete stack");
- efl_event_callback_add(btn, EFL_UI_EVENT_CLICKED, _stack_del, stack);
+ efl_event_callback_add(btn, EFL_INPUT_EVENT_CLICKED, _stack_del, stack);
Eo *nl = _navigation_layout_create(stack, "1st layout", btn);
diff --git a/src/bin/elementary/test_ui_tab_pager.c b/src/bin/elementary/test_ui_tab_pager.c
index ab0559276e..c7180a555e 100644
--- a/src/bin/elementary/test_ui_tab_pager.c
+++ b/src/bin/elementary/test_ui_tab_pager.c
@@ -222,7 +222,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -238,7 +238,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Current Tab Page Set"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tab_set_btn_cb, tsd),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tab_set_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd),
efl_pack_end(box, efl_added));
}
@@ -327,7 +327,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -336,25 +336,25 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Pack Begin */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_begin_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack End */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_end_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_end_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack Before */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Tab Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_before_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_before_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Pack After */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Tab Page"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_after_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_after_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
in_box = efl_add(EFL_UI_BOX_CLASS, box,
@@ -373,7 +373,7 @@ _pack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Pack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Pack At"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _pack_at_btn_cb, tsd),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _pack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd),
efl_pack_end(in_box, efl_added));
}
@@ -431,7 +431,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -440,20 +440,20 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Clear */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clear_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clear_btn_cb, tab_pager),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added));
/* Unpack */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
/* Unpack All */
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack All"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_all_btn_cb, tab_pager),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added));
@@ -473,7 +473,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Unpack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Unpack At"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _unpack_at_btn_cb, tsd),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _unpack_at_btn_cb, tsd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _unpack_at_btn_del_cb, tsd),
efl_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(in_box, efl_added));
@@ -526,7 +526,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -548,7 +548,7 @@ _tab_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Change"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _change_btn_cb, tcd),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _change_btn_cb, tcd),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd),
efl_pack_end(box, efl_added));
}
@@ -586,7 +586,7 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_cb, navi));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE),
@@ -594,15 +594,15 @@ _transition_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Scroll"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_scroll_cb, tab_pager),
efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Stack"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_set_btn_stack_cb, tab_pager),
efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unset"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _tran_unset_btn_cb, tab_pager),
efl_pack_end(box, efl_added));
}
diff --git a/src/bin/elementary/test_ui_table.c b/src/bin/elementary/test_ui_table.c
index 34991f6634..437c9bed2d 100644
--- a/src/bin/elementary/test_ui_table.c
+++ b/src/bin/elementary/test_ui_table.c
@@ -543,7 +543,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
efl_text_set(o, btn_text("appended"));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@@ -597,7 +597,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Append");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, append_cb, table);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, append_cb, table);
efl_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1);
@@ -606,7 +606,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
o = elm_button_add(win);
elm_object_content_set(o, ico);
elm_object_text_set(o, "Clear");
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, clear_cb, table);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, clear_cb, table);
efl_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1);
@@ -657,7 +657,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@@ -665,7 +665,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
@@ -673,7 +673,7 @@ test_ui_table_linear(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE);
- efl_event_callback_add(o, EFL_UI_EVENT_CLICKED, remove_cb, NULL);
+ efl_event_callback_add(o, EFL_INPUT_EVENT_CLICKED, remove_cb, NULL);
efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1);
diff --git a/src/bin/elementary/test_ui_table_static.c b/src/bin/elementary/test_ui_table_static.c
index d21d6b6c7d..3e5ff789c4 100644
--- a/src/bin/elementary/test_ui_table_static.c
+++ b/src/bin/elementary/test_ui_table_static.c
@@ -133,7 +133,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function");
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _api_bt_clicked, api);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _api_bt_clicked, api);
efl_pack_table(table, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST);
efl_gfx_entity_visible_set(bt, 1);
@@ -162,7 +162,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bt = elm_button_add(win);
elm_object_text_set(bt, "Change");
efl_pack_table(table, bt, 40, 40, 20, 20);
- efl_event_callback_add(bt, EFL_UI_EVENT_CLICKED, _ch_table, table);
+ efl_event_callback_add(bt, EFL_INPUT_EVENT_CLICKED, _ch_table, table);
efl_gfx_entity_visible_set(bt, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
diff --git a/src/bin/elementary/test_ui_tags.c b/src/bin/elementary/test_ui_tags.c
index 2ef7d6db2b..475bc68837 100644
--- a/src/bin/elementary/test_ui_tags.c
+++ b/src/bin/elementary/test_ui_tags.c
@@ -83,7 +83,7 @@ test_ui_tags(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_i
efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Change mode"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, tags),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, tags),
elm_object_part_content_set(layout, "box", efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480));
diff --git a/src/bin/elementary/test_win_indicator.c b/src/bin/elementary/test_win_indicator.c
index 0ebb30bf0f..aa9606f316 100644
--- a/src/bin/elementary/test_win_indicator.c
+++ b/src/bin/elementary/test_win_indicator.c
@@ -106,18 +106,18 @@ test_win_indicator(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *e
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Indicator Off"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _off_clicked, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _off_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Opaque"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _opaque_clicked, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _opaque_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Transparent"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _transparent_clicked, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _transparent_clicked, win),
efl_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Hidden"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _hidden_clicked, win),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _hidden_clicked, win),
efl_pack(bx, efl_added));
}
diff --git a/src/examples/elementary/button_cxx_example_00.cc b/src/examples/elementary/button_cxx_example_00.cc
index 2d58c7fc03..ae0a0fa44f 100644
--- a/src/examples/elementary/button_cxx_example_00.cc
+++ b/src/examples/elementary/button_cxx_example_00.cc
@@ -29,7 +29,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto cb(std::bind([wbt]() {
std::cout << wbt->text_get() << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, bt, cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, bt, cb);
efl::ui::Button bt2(instantiate, win);
bt2.text_set("Click to quit");
@@ -39,7 +39,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto cb2(std::bind([wwin]() {
::efl_del(wwin->_eo_ptr()); // FIXME: No proper C++ API to delete win
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, bt2, cb2);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, bt2, cb2);
win.size_set({320,160});
}
diff --git a/src/examples/elementary/button_cxx_example_01.cc b/src/examples/elementary/button_cxx_example_01.cc
index 47b1b9deb3..8623dfa111 100644
--- a/src/examples/elementary/button_cxx_example_01.cc
+++ b/src/examples/elementary/button_cxx_example_01.cc
@@ -67,17 +67,17 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
wright->autorepeat_gap_timeout_set(t);
}
}, std::placeholders::_1);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn, btn_options);
efl::ui::Button btn2(instantiate, win);
btn2.text_set("Initial: 1.0");
box_initial.pack_end(btn2);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn2, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn2, btn_options);
efl::ui::Button btn3(instantiate, win);
btn3.text_set("Initial: 5.0");
box_initial.pack_end(btn3);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn3, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn3, btn_options);
efl::ui::Box box_gap(instantiate, win);
box_gap.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
@@ -87,17 +87,17 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl::ui::Button btn4(instantiate, win);
btn4.text_set("Gap: 0.1");
box_gap.pack_end(btn4);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn4, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn4, btn_options);
efl::ui::Button btn5(instantiate, win);
btn5.text_set("Gap: 0.5");
box_gap.pack_end(btn5);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn5, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn5, btn_options);
efl::ui::Button btn6(instantiate, win);
btn6.text_set("Gap: 1.0");
box_gap.pack_end(btn6);
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, btn6, btn_options);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, btn6, btn_options);
up.autorepeat_enabled_set(true);
up.autorepeat_initial_timeout_set(1.0);
@@ -169,7 +169,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
icon_still = nullptr;
}
});
- efl::eolian::event_add(efl::ui::Clickable::unpressed_event, up, btn_cursors_release);
+ efl::eolian::event_add(efl::input::Clickable::unpressed_event, up, btn_cursors_release);
efl::ui::Image icon_up(instantiate, win);
icon_up.icon_set("arrow_up");
@@ -188,7 +188,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
left.hint_align_set(0.0, 0.5);
box_inferior.pack_end(left);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, left, btn_cursors_move);
- efl::eolian::event_add(efl::ui::Clickable::unpressed_event, left, btn_cursors_release);
+ efl::eolian::event_add(efl::input::Clickable::unpressed_event, left, btn_cursors_release);
efl::ui::Image icon_left(instantiate, win);
icon_left.icon_set("arrow_left");
@@ -208,7 +208,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
right.hint_align_set(0.0, 0.5);
box_inferior.pack_end(right);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, right, btn_cursors_move);
- efl::eolian::event_add(efl::ui::Clickable::unpressed_event, right, btn_cursors_release);
+ efl::eolian::event_add(efl::input::Clickable::unpressed_event, right, btn_cursors_release);
efl::ui::Image icon_right(instantiate, win);
icon_right.icon_set("arrow_right");
@@ -222,7 +222,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
down.hint_align_set(0.5, 0.0);
box.pack_end(down);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, down, btn_cursors_move);
- efl::eolian::event_add(efl::ui::Clickable::unpressed_event, down, btn_cursors_release);
+ efl::eolian::event_add(efl::input::Clickable::unpressed_event, down, btn_cursors_release);
efl::ui::Image icon_down(instantiate, win);
icon_down.icon_set("arrow_down");
diff --git a/src/examples/elementary/efl_ui_list_example_1.c b/src/examples/elementary/efl_ui_list_example_1.c
index a7be7937df..a778617c93 100644
--- a/src/examples/elementary/efl_ui_list_example_1.c
+++ b/src/examples/elementary/efl_ui_list_example_1.c
@@ -129,9 +129,9 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_SELECTED, _list_selected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_ITEM_UNSELECTED, _list_unselected, NULL);
- efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL);
- efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL);
- efl_event_callback_add(list, EFL_UI_EVENT_LONGPRESSED, _list_longpressed, NULL);
+ efl_event_callback_add(list, EFL_INPUT_EVENT_PRESSED, _list_pressed, NULL);
+ efl_event_callback_add(list, EFL_INPUT_EVENT_UNPRESSED, _list_unpressed, NULL);
+ efl_event_callback_add(list, EFL_INPUT_EVENT_LONGPRESSED, _list_longpressed, NULL);
for (i = 0; i < NUM_ITEMS; i++)
{
@@ -299,14 +299,14 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_text_set(scrl_btn, "Scroll Item");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25));
- efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_btn_clicked, NULL);
+ efl_event_callback_add(scrl_btn, EFL_INPUT_EVENT_CLICKED, _scrl_btn_clicked, NULL);
efl_pack_end(rbox, scrl_btn);
scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox);
efl_text_set(scrl_btn, "Scroll Item Align");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25));
- efl_event_callback_add(scrl_btn, EFL_UI_EVENT_CLICKED, _scrl_align_btn_clicked, NULL);
+ efl_event_callback_add(scrl_btn, EFL_INPUT_EVENT_CLICKED, _scrl_align_btn_clicked, NULL);
efl_pack_end(rbox, scrl_btn);
efl_pack_end(bbox, rbox);
diff --git a/src/examples/elementary/efl_ui_slideshow_example.c b/src/examples/elementary/efl_ui_slideshow_example.c
index 4681037b3e..55c1b66fab 100644
--- a/src/examples/elementary/efl_ui_slideshow_example.c
+++ b/src/examples/elementary/efl_ui_slideshow_example.c
@@ -110,7 +110,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack_table(table, efl_added, 0, 1, 1, 1),
efl_text_set(efl_added, "Play"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _play_toggle, NULL));
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _play_toggle, NULL));
efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
}
diff --git a/src/examples/elementary/efl_ui_theme_example_01.c b/src/examples/elementary/efl_ui_theme_example_01.c
index 15e1017e50..fe09a83556 100644
--- a/src/examples/elementary/efl_ui_theme_example_01.c
+++ b/src/examples/elementary/efl_ui_theme_example_01.c
@@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload extension"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_extension_clicked_cb, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_extension_clicked_cb, NULL),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
diff --git a/src/examples/elementary/efl_ui_theme_example_02.c b/src/examples/elementary/efl_ui_theme_example_02.c
index 0d0390b82c..1b7e61c96a 100644
--- a/src/examples/elementary/efl_ui_theme_example_02.c
+++ b/src/examples/elementary/efl_ui_theme_example_02.c
@@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload overlay"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _btn_overlay_clicked_cb, NULL),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _btn_overlay_clicked_cb, NULL),
efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box,
diff --git a/src/examples/elementary/popup_cxx_example.cc b/src/examples/elementary/popup_cxx_example.cc
index 6195c430c7..4d670ebce3 100644
--- a/src/examples/elementary/popup_cxx_example.cc
+++ b/src/examples/elementary/popup_cxx_example.cc
@@ -84,7 +84,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto repeat_events_test_cb(std::bind([]() {
std::cout << "Repeat Test Button is clicked" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, repeat_events_test_btn, repeat_events_test_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, repeat_events_test_btn, repeat_events_test_cb);
g_repeat_events_test_btn = repeat_events_test_btn;
@@ -110,7 +110,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
}
}
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, create_btn, create_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, create_btn, create_cb);
//Delete Button
@@ -128,7 +128,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
else
std::cout << "Efl.Ui.Popup does not exist" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, delete_btn, delete_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, delete_btn, delete_cb);
//Repeat Events Button
@@ -156,7 +156,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
repeat_events_btn.text_set("Unset Repeat Events");
}
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, repeat_events_btn, repeat_events_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, repeat_events_btn, repeat_events_cb);
//Dummy Button
@@ -184,7 +184,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
dummy_btn.text_set("Hide Dummy Button");
}
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, dummy_btn, dummy_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, dummy_btn, dummy_cb);
//Backwall Button
@@ -215,7 +215,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
backwall_btn.text_set("Set Backwall");
}
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, backwall_btn, backwall_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, backwall_btn, backwall_cb);
//Timeout Button
@@ -230,7 +230,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.timeout_set(3);
std::cout << "Timeout is set to 3 seconds" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, timeout_btn, timeout_set_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, timeout_btn, timeout_set_cb);
//Center Button
@@ -245,7 +245,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_CENTER);
std::cout << "Align Center" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, center_btn, center_align_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, center_btn, center_align_cb);
//Top Button
@@ -260,7 +260,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_TOP);
std::cout << "Align Top" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, top_btn, top_align_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, top_btn, top_align_cb);
//Left Button
@@ -275,7 +275,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_LEFT);
std::cout << "Align Left" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, left_btn, left_align_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, left_btn, left_align_cb);
//Right Button
@@ -290,7 +290,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_RIGHT);
std::cout << "Align Right" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, right_btn, right_align_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, right_btn, right_align_cb);
//Bottom Button
@@ -305,7 +305,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.align_set(EFL_UI_POPUP_ALIGN_BOTTOM);
std::cout << "Align Bottom" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, bottom_btn, bottom_align_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, bottom_btn, bottom_align_cb);
//Position Button
@@ -320,6 +320,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.position_set({0, 0});
std::cout << "Position is set to (0, 0)" << std::endl;
}));
- efl::eolian::event_add(efl::ui::Clickable::clicked_event, position_btn, position_set_cb);
+ efl::eolian::event_add(efl::input::Clickable::clicked_event, position_btn, position_set_cb);
}
EFL_MAIN()
diff --git a/src/lib/elementary/Efl_Ui.h b/src/lib/elementary/Efl_Ui.h
index e390b89efe..8ccc063dea 100644
--- a/src/lib/elementary/Efl_Ui.h
+++ b/src/lib/elementary/Efl_Ui.h
@@ -246,7 +246,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
# include <efl_ui_navigation_bar_part.eo.h>
# include <efl_ui_navigation_bar_part_back_button.eo.h>
# include <efl_ui_navigation_layout.eo.h>
-# include <efl_ui_clickable.eo.h>
# include <efl_ui_clickable_util.eo.h>
# include <efl_ui_format.eo.h>
# include <efl_ui_spin.eo.h>
diff --git a/src/lib/elementary/Elementary.h b/src/lib/elementary/Elementary.h
index bdc128a2b8..1e273b3d95 100644
--- a/src/lib/elementary/Elementary.h
+++ b/src/lib/elementary/Elementary.h
@@ -169,7 +169,6 @@ typedef Eo Efl_Ui_Focus_Manager;
#ifdef EFL_BETA_API_SUPPORT
# include <elm_interface_scrollable.h>
# include <elm_interface_scrollable.eo.h>
-#include <efl_ui_clickable.eo.h>
#endif
#include <elm_tooltip.h>
diff --git a/src/lib/elementary/efl_ui_alert_popup.c b/src/lib/elementary/efl_ui_alert_popup.c
index e7eac4a955..b80e6e6388 100644
--- a/src/lib/elementary/efl_ui_alert_popup.c
+++ b/src/lib/elementary/efl_ui_alert_popup.c
@@ -154,15 +154,15 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler
switch (type)
{
case EFL_UI_ALERT_POPUP_BUTTON_POSITIVE:
- efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
_positive_button_clicked_cb, obj);
break;
case EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE:
- efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
_negative_button_clicked_cb, obj);
break;
case EFL_UI_ALERT_POPUP_BUTTON_USER:
- efl_event_callback_add(pd->button[type], EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(pd->button[type], EFL_INPUT_EVENT_CLICKED,
_user_button_clicked_cb, obj);
break;
default:
diff --git a/src/lib/elementary/efl_ui_button.c b/src/lib/elementary/efl_ui_button.c
index 6694a91f4a..834e00f43d 100644
--- a/src/lib/elementary/efl_ui_button.c
+++ b/src/lib/elementary/efl_ui_button.c
@@ -6,7 +6,7 @@
#define EFL_ACCESS_OBJECT_PROTECTED
#define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
#include "elm_priv.h"
@@ -77,8 +77,8 @@ _activate(Evas_Object *obj)
evas_object_smart_callback_call(obj, "clicked", NULL);
else
{
- efl_ui_clickable_press(obj, 1);
- efl_ui_clickable_unpress(obj, 1);
+ efl_input_clickable_press(obj, 1);
+ efl_input_clickable_unpress(obj, 1);
}
}
}
@@ -107,8 +107,8 @@ _efl_ui_button_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Button_Data *_pd
evas_object_smart_callback_call(obj, "clicked", NULL);
else
{
- efl_ui_clickable_press(obj, 1);
- efl_ui_clickable_unpress(obj, 1);
+ efl_input_clickable_press(obj, 1);
+ efl_input_clickable_unpress(obj, 1);
}
if (elm_widget_is_legacy(obj))
diff --git a/src/lib/elementary/efl_ui_button.eo b/src/lib/elementary/efl_ui_button.eo
index 449d501276..794ed9b04a 100644
--- a/src/lib/elementary/efl_ui_button.eo
+++ b/src/lib/elementary/efl_ui_button.eo
@@ -1,4 +1,4 @@
-class Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Ui.Autorepeat,
+class Efl.Ui.Button extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, Efl.Ui.Autorepeat,
Efl.Text, Efl.Content,
Efl.Access.Widget.Action
{
diff --git a/src/lib/elementary/efl_ui_calendar.c b/src/lib/elementary/efl_ui_calendar.c
index 7fb174273f..d905324c82 100644
--- a/src/lib/elementary/efl_ui_calendar.c
+++ b/src/lib/elementary/efl_ui_calendar.c
@@ -441,7 +441,7 @@ _btn_create(Eo *obj, const char *style, char *part)
efl_ui_autorepeat_enabled_set(efl_added, EINA_TRUE),
efl_ui_autorepeat_initial_timeout_set(efl_added, FIRST_INTERVAL),
efl_ui_autorepeat_gap_timeout_set(efl_added, INTERVAL),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED,
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED,
_inc_dec_btn_clicked_cb, obj),
efl_event_callback_add(efl_added, EFL_UI_AUTOREPEAT_EVENT_REPEATED,
_inc_dec_btn_repeated_cb, obj),
diff --git a/src/lib/elementary/efl_ui_clickable_util.c b/src/lib/elementary/efl_ui_clickable_util.c
index 3243b725bb..50251c48fd 100644
--- a/src/lib/elementary/efl_ui_clickable_util.c
+++ b/src/lib/elementary/efl_ui_clickable_util.c
@@ -2,7 +2,7 @@
# include <config.h>
#endif
-#define EFL_UI_CLICKABLE_PROTECTED 1
+#define EFL_INPUT_CLICKABLE_PROTECTED 1
#include <Efl_Ui.h>
#include "elm_priv.h"
@@ -17,7 +17,7 @@ _on_press_cb(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- efl_ui_clickable_press(data, 1);
+ efl_input_clickable_press(data, 1);
}
static void
@@ -26,7 +26,7 @@ _on_unpress_cb(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- efl_ui_clickable_unpress(data, 1);
+ efl_input_clickable_unpress(data, 1);
}
static void
@@ -35,7 +35,7 @@ _on_mouse_out(void *data,
const char *emission EINA_UNUSED,
const char *source EINA_UNUSED)
{
- efl_ui_clickable_button_state_reset(data, 1);
+ efl_input_clickable_button_state_reset(data, 1);
}
static void
@@ -44,7 +44,7 @@ _theme_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Efl_Input_Pointer *pointer = ev->info;
if (efl_input_processed_get(pointer))
- efl_ui_clickable_button_state_reset(data, 1);
+ efl_input_clickable_button_state_reset(data, 1);
}
EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
@@ -52,7 +52,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
)
EOLIAN static void
-_efl_ui_clickable_util_bind_to_theme(Efl_Canvas_Layout *object, Efl_Ui_Clickable *clickable)
+_efl_ui_clickable_util_bind_to_theme(Efl_Canvas_Layout *object, Efl_Input_Clickable *clickable)
{
efl_event_callback_array_add(object, bind_to_theme_callbacks(), clickable);
@@ -67,7 +67,7 @@ _press_cb(void *data, const Efl_Event *ev)
Efl_Input_Pointer *pointer = ev->info;
if (!efl_input_processed_get(pointer))
{
- efl_ui_clickable_press(data, 1);
+ efl_input_clickable_press(data, 1);
efl_input_processed_set(pointer, EINA_TRUE);
}
}
@@ -80,21 +80,21 @@ _unpress_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Eina_Rect geom = efl_gfx_entity_geometry_get(data);
if (efl_input_processed_get(pointer))
{
- efl_ui_clickable_button_state_reset(data, 1);
+ efl_input_clickable_button_state_reset(data, 1);
}
else if (!eina_rectangle_coords_inside(&geom.rect, mouse_pos.x, mouse_pos.y))
{
//we are emulating edje behavior here, do press unpress on the event, but not click
- efl_ui_clickable_button_state_reset(data, 1);
+ efl_input_clickable_button_state_reset(data, 1);
if (efl_canvas_object_pointer_mode_get(data) == EFL_INPUT_OBJECT_POINTER_MODE_AUTO_GRAB)
{
- efl_ui_clickable_unpress(data, 1);
+ efl_input_clickable_unpress(data, 1);
efl_input_processed_set(pointer, EINA_TRUE);
}
}
else
{
- efl_ui_clickable_unpress(data, 1);
+ efl_input_clickable_unpress(data, 1);
efl_input_processed_set(pointer, EINA_TRUE);
}
}
@@ -105,7 +105,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_object_callbacks,
)
EOLIAN static void
-_efl_ui_clickable_util_bind_to_object(Efl_Input_Interface *object, Efl_Ui_Clickable *clickable)
+_efl_ui_clickable_util_bind_to_object(Efl_Input_Interface *object, Efl_Input_Clickable *clickable)
{
efl_event_callback_array_add(object, bind_to_object_callbacks(), clickable);
}
diff --git a/src/lib/elementary/efl_ui_clickable_util.eo b/src/lib/elementary/efl_ui_clickable_util.eo
index d086c24581..5db5e67a5c 100644
--- a/src/lib/elementary/efl_ui_clickable_util.eo
+++ b/src/lib/elementary/efl_ui_clickable_util.eo
@@ -1,12 +1,12 @@
class @beta Efl.Ui.Clickable_Util {
- [[Helper class that connects theme signals or object events to the @Efl.Ui.Clickable interface.
+ [[Helper class that connects theme signals or object events to the @Efl.Input.Clickable interface.
- This simplifies creating widgets that implement the @Efl.Ui.Clickable interface.
+ This simplifies creating widgets that implement the @Efl.Input.Clickable interface.
]]
methods {
bind_to_theme @class {
[[This will listen to the standard "click" events on a theme and emit the appropriate
- events through the @Efl.Ui.Clickable interface.
+ events through the @Efl.Input.Clickable interface.
Using these methods widgets do not need to listen to the theme signals. This class
does it and calls the correct clickable functions.
@@ -16,12 +16,12 @@ class @beta Efl.Ui.Clickable_Util {
]]
params {
object : Efl.Canvas.Layout; [[The object to listen on.]]
- clickable : Efl.Ui.Clickable; [[The object to call the clickable methods on.]]
+ clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
}
}
bind_to_object @class {
[[This will listen to the standard "click" events on an object, and emit the appropriate
- events through the @Efl.Ui.Clickable interface.
+ events through the @Efl.Input.Clickable interface.
Using these methods widgets do not need to listen to the object events. This class
does it and calls the correct clickable functions.
@@ -30,7 +30,7 @@ class @beta Efl.Ui.Clickable_Util {
]]
params {
object : Efl.Input.Interface; [[The object to listen on.]]
- clickable : Efl.Ui.Clickable; [[The object to call the clickable methods on.]]
+ clickable : Efl.Input.Clickable; [[The object to call the clickable methods on.]]
}
}
}
diff --git a/src/lib/elementary/efl_ui_collection.c b/src/lib/elementary/efl_ui_collection.c
index 564bb108e0..b12712b139 100644
--- a/src/lib/elementary/efl_ui_collection.c
+++ b/src/lib/elementary/efl_ui_collection.c
@@ -517,11 +517,11 @@ _redirect_cb(void *data, const Efl_Event *ev)
#define REDIRECT_EVT(item_evt, item) \
if (item_evt == ev->desc) efl_event_callback_call(obj, item, ev->object);
- REDIRECT_EVT(EFL_UI_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
- REDIRECT_EVT(EFL_UI_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
- REDIRECT_EVT(EFL_UI_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
- REDIRECT_EVT(EFL_UI_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY);
- REDIRECT_EVT(EFL_UI_EVENT_CLICKED, EFL_UI_EVENT_ITEM_CLICKED);
+ REDIRECT_EVT(EFL_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
+ REDIRECT_EVT(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
+ REDIRECT_EVT(EFL_INPUT_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
+ REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY);
+ REDIRECT_EVT(EFL_INPUT_EVENT_CLICKED, EFL_UI_EVENT_ITEM_CLICKED);
#undef REDIRECT_EVT
}
@@ -529,11 +529,11 @@ EFL_CALLBACKS_ARRAY_DEFINE(active_item,
{EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb},
{EFL_UI_EVENT_ITEM_SELECTED, _selected_cb},
{EFL_UI_EVENT_ITEM_UNSELECTED, _unselected_cb},
- {EFL_UI_EVENT_PRESSED, _redirect_cb},
- {EFL_UI_EVENT_UNPRESSED, _redirect_cb},
- {EFL_UI_EVENT_LONGPRESSED, _redirect_cb},
- {EFL_UI_EVENT_CLICKED, _redirect_cb},
- {EFL_UI_EVENT_CLICKED_ANY, _redirect_cb},
+ {EFL_INPUT_EVENT_PRESSED, _redirect_cb},
+ {EFL_INPUT_EVENT_UNPRESSED, _redirect_cb},
+ {EFL_INPUT_EVENT_LONGPRESSED, _redirect_cb},
+ {EFL_INPUT_EVENT_CLICKED, _redirect_cb},
+ {EFL_INPUT_EVENT_CLICKED_ANY, _redirect_cb},
{EFL_EVENT_INVALIDATE, _invalidate_cb},
)
diff --git a/src/lib/elementary/efl_ui_frame.c b/src/lib/elementary/efl_ui_frame.c
index fd9420d6b7..a47a8669dd 100644
--- a/src/lib/elementary/efl_ui_frame.c
+++ b/src/lib/elementary/efl_ui_frame.c
@@ -5,7 +5,7 @@
#define EFL_ACCESS_OBJECT_PROTECTED
#define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
#include "elm_priv.h"
@@ -148,7 +148,7 @@ _efl_ui_frame_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Frame_Data *_pd EINA_UN
(wd->resize_obj, "efl,anim,done", "efl",
_on_recalc_done, obj);
efl_ui_clickable_util_bind_to_theme(wd->resize_obj, obj);
- efl_event_callback_add(obj, EFL_UI_EVENT_CLICKED, _clicked_cb, obj);
+ efl_event_callback_add(obj, EFL_INPUT_EVENT_CLICKED, _clicked_cb, obj);
}
elm_widget_can_focus_set(obj, EINA_FALSE);
diff --git a/src/lib/elementary/efl_ui_frame.eo b/src/lib/elementary/efl_ui_frame.eo
index 509bd02df0..31849f95d7 100644
--- a/src/lib/elementary/efl_ui_frame.eo
+++ b/src/lib/elementary/efl_ui_frame.eo
@@ -1,4 +1,4 @@
-class @beta Efl.Ui.Frame extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable, Efl.Text, Efl.Text_Markup,
+class @beta Efl.Ui.Frame extends Efl.Ui.Layout_Base implements Efl.Input.Clickable, Efl.Text, Efl.Text_Markup,
Efl.Content
{
[[Frame widget
diff --git a/src/lib/elementary/efl_ui_image.c b/src/lib/elementary/efl_ui_image.c
index dea9ec1b00..4f79fb0c2d 100644
--- a/src/lib/elementary/efl_ui_image.c
+++ b/src/lib/elementary/efl_ui_image.c
@@ -7,7 +7,7 @@
#define EFL_ACCESS_COMPONENT_PROTECTED
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define EFL_LAYOUT_CALC_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
@@ -747,7 +747,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
if (elm_widget_is_legacy(obj))
evas_object_smart_callback_call(obj, "clicked", NULL);
else
- efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
return EINA_TRUE;
}
diff --git a/src/lib/elementary/efl_ui_image.eo b/src/lib/elementary/efl_ui_image.eo
index 728a6c4cb0..f756d179bd 100644
--- a/src/lib/elementary/efl_ui_image.eo
+++ b/src/lib/elementary/efl_ui_image.eo
@@ -16,7 +16,7 @@ struct @beta Efl.Ui.Image_Error
open_error: bool; [[$true if the error happened when opening the file, $false otherwise]]
}
-class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Ui.Clickable, Efl.Ui.Draggable,
+class @beta Efl.Ui.Image extends Efl.Ui.Widget implements Efl.Input.Clickable, Efl.Ui.Draggable,
Efl.File, Efl.Gfx.Image, Efl.Gfx.Image_Load_Controller, Efl.Player, Efl.Gfx.View,
Efl.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
Efl.Gfx.Image_Orientable,
diff --git a/src/lib/elementary/efl_ui_image_zoomable.c b/src/lib/elementary/efl_ui_image_zoomable.c
index 9d834afad2..bc64ecb9eb 100644
--- a/src/lib/elementary/efl_ui_image_zoomable.c
+++ b/src/lib/elementary/efl_ui_image_zoomable.c
@@ -6,7 +6,7 @@
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define EFL_UI_SCROLL_MANAGER_PROTECTED
#define EFL_UI_SCROLLBAR_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
diff --git a/src/lib/elementary/efl_ui_item.c b/src/lib/elementary/efl_ui_item.c
index 432486bd69..5119568773 100644
--- a/src/lib/elementary/efl_ui_item.c
+++ b/src/lib/elementary/efl_ui_item.c
@@ -175,7 +175,7 @@ _item_longpressed(void *data)
pd->longpress_timer = NULL;
- efl_event_callback_call(item, EFL_UI_EVENT_LONGPRESSED, NULL);
+ efl_event_callback_call(item, EFL_INPUT_EVENT_LONGPRESSED, NULL);
return ECORE_CALLBACK_CANCEL;
}
@@ -195,7 +195,7 @@ _item_mouse_down(void *data,
edje_object_signal_emit(wd->resize_obj, "efl,state,pressed", "efl");
pd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _item_longpressed, item);
- efl_event_callback_call(item, EFL_UI_EVENT_PRESSED, NULL);
+ efl_event_callback_call(item, EFL_INPUT_EVENT_PRESSED, NULL);
}
static void
@@ -217,7 +217,7 @@ _item_mouse_up(void *data,
{
//FIXME: should we send this message to fallback?
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
- //efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL);
+ //efl_event_callback_call(item, EFL_INPUT_EVENT_UNPRESSED, NULL);
return;
}
@@ -228,7 +228,7 @@ _item_mouse_up(void *data,
}
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl");
- efl_event_callback_call(item, EFL_UI_EVENT_UNPRESSED, NULL);
+ efl_event_callback_call(item, EFL_INPUT_EVENT_UNPRESSED, NULL);
m = efl_ui_select_mode_get(efl_ui_item_container_get(item));
if ((m != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected))
diff --git a/src/lib/elementary/efl_ui_item.eo b/src/lib/elementary/efl_ui_item.eo
index 9ece7e4c0c..a97ec30568 100644
--- a/src/lib/elementary/efl_ui_item.eo
+++ b/src/lib/elementary/efl_ui_item.eo
@@ -1,4 +1,4 @@
-abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Ui.Clickable
+abstract @beta Efl.Ui.Item extends Efl.Ui.Layout_Base implements Efl.Ui.Selectable, Efl.Input.Clickable
{
[[Item abstract class for pack widget. All item have to be inherited from this class.]]
methods {
diff --git a/src/lib/elementary/efl_ui_navigation_bar.c b/src/lib/elementary/efl_ui_navigation_bar.c
index 6c1de6773a..039b7f563f 100644
--- a/src/lib/elementary/efl_ui_navigation_bar.c
+++ b/src/lib/elementary/efl_ui_navigation_bar.c
@@ -48,7 +48,7 @@ _efl_ui_navigation_bar_efl_object_constructor(Eo *obj, Efl_Ui_Navigation_Bar_Dat
Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
elm_widget_element_update(obj, efl_added, "back_button"),
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, obj),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, obj),
efl_gfx_entity_visible_set(efl_added, EINA_FALSE));
pd->back_button = back_button;
@@ -182,7 +182,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_set(Eo *obj, void *_
if (content == ppd->back_button) return EINA_FALSE;
- efl_event_callback_add(content, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
+ efl_event_callback_add(content, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
ppd->back_button = content;
return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, content);
@@ -203,7 +203,7 @@ _efl_ui_navigation_bar_part_back_button_efl_content_content_unset(Eo *obj, void
Elm_Part_Data *pd = efl_data_scope_get(obj, EFL_UI_WIDGET_PART_CLASS);
EFL_UI_NAVIGATION_BAR_DATA_GET_OR_RETURN(pd->obj, ppd, NULL);
- efl_event_callback_del(ppd->back_button, EFL_UI_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
+ efl_event_callback_del(ppd->back_button, EFL_INPUT_EVENT_CLICKED, _back_button_clicked_cb, pd->obj);
ppd->back_button = NULL;
return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part);
diff --git a/src/lib/elementary/efl_ui_panes.c b/src/lib/elementary/efl_ui_panes.c
index 7069e3edb5..e14d3de505 100644
--- a/src/lib/elementary/efl_ui_panes.c
+++ b/src/lib/elementary/efl_ui_panes.c
@@ -6,7 +6,7 @@
#define ELM_LAYOUT_PROTECTED
#define EFL_GFX_HINT_PROTECTED
#define EFL_PART_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
@@ -184,7 +184,7 @@ _on_pressed(void *data,
const char *source EINA_UNUSED)
{
efl_event_callback_legacy_call(data, ELM_PANES_EVENT_PRESS, NULL);
- efl_ui_clickable_press(data, 1);
+ efl_input_clickable_press(data, 1);
}
static void
@@ -195,7 +195,7 @@ _on_unpressed(void *data,
{
EFL_UI_PANES_DATA_GET(data, sd);
efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL);
- efl_ui_clickable_unpress(data, 1);
+ efl_input_clickable_unpress(data, 1);
if (sd->double_clicked)
{
evas_object_smart_callback_call(data, "clicked,double", NULL);
diff --git a/src/lib/elementary/efl_ui_panes.eo b/src/lib/elementary/efl_ui_panes.eo
index a9c2bbd089..5b5029a67f 100644
--- a/src/lib/elementary/efl_ui_panes.eo
+++ b/src/lib/elementary/efl_ui_panes.eo
@@ -1,5 +1,5 @@
class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable,
- Efl.Ui.Clickable
+ Efl.Input.Clickable
{
[[Elementary panes class]]
event_prefix: elm_panes;
diff --git a/src/lib/elementary/efl_ui_spin_button.c b/src/lib/elementary/efl_ui_spin_button.c
index 6974428dc4..13b3c2ddf2 100644
--- a/src/lib/elementary/efl_ui_spin_button.c
+++ b/src/lib/elementary/efl_ui_spin_button.c
@@ -41,7 +41,7 @@ static void
_access_increment_decrement_info_say(Evas_Object *obj, Eina_Bool is_incremented);
EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
- { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
+ { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
{ EFL_UI_AUTOREPEAT_EVENT_REPEATED, _inc_dec_button_clicked_cb},
);
diff --git a/src/lib/elementary/efl_ui_tags.c b/src/lib/elementary/efl_ui_tags.c
index 34bc487355..97393c8d47 100644
--- a/src/lib/elementary/efl_ui_tags.c
+++ b/src/lib/elementary/efl_ui_tags.c
@@ -28,7 +28,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_tags_cb,
{ ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
{ EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb },
- { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
+ { EFL_INPUT_EVENT_CLICKED, _entry_clicked_cb }
);
static void
@@ -489,7 +489,7 @@ _mouse_clicked_signal_cb(void *data EINA_UNUSED,
if (sd->editable) efl_ui_text_input_panel_show(sd->entry);
- efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
}
static void
diff --git a/src/lib/elementary/efl_ui_text.c b/src/lib/elementary/efl_ui_text.c
index 3201c8875e..419fd84434 100644
--- a/src/lib/elementary/efl_ui_text.c
+++ b/src/lib/elementary/efl_ui_text.c
@@ -7,7 +7,7 @@
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
#define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED
-#define EFL_UI_CLICKABLE_PROTECTED
+#define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h>
#include <Elementary_Cursor.h>
@@ -2118,7 +2118,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
if (!elm_widget_theme_klass_get(obj))
elm_widget_theme_klass_set(obj, "text");
obj = efl_constructor(efl_super(obj, MY_CLASS));
- efl_event_callback_add(obj, EFL_UI_EVENT_LONGPRESSED, _long_press_cb, obj);
+ efl_event_callback_add(obj, EFL_INPUT_EVENT_LONGPRESSED, _long_press_cb, obj);
text_obj = efl_add(EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS, obj);
efl_event_callback_forwarder_add(text_obj, EFL_UI_TEXT_EVENT_CHANGED_USER, obj);
@@ -2822,7 +2822,7 @@ _efl_ui_text_efl_ui_widget_on_access_activate(Eo *obj, Efl_Ui_Text_Data *_pd EIN
if (!elm_widget_disabled_get(obj) &&
!evas_object_freeze_events_get(obj))
{
- efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
if (sd->editable && sd->input_panel_enable)
edje_object_part_text_input_panel_show(sd->entry_edje, "efl.text");
}
diff --git a/src/lib/elementary/efl_ui_text.eo b/src/lib/elementary/efl_ui_text.eo
index d34b2822d2..a0a1807942 100644
--- a/src/lib/elementary/efl_ui_text.eo
+++ b/src/lib/elementary/efl_ui_text.eo
@@ -1,7 +1,7 @@
/* FIXME - Text object must stop using elm_general! */
import elm_general;
-class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Ui.Clickable,
+class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup
{
diff --git a/src/lib/elementary/efl_ui_timepicker.c b/src/lib/elementary/efl_ui_timepicker.c
index 59ef13d3f1..6d568bcef8 100644
--- a/src/lib/elementary/efl_ui_timepicker.c
+++ b/src/lib/elementary/efl_ui_timepicker.c
@@ -136,7 +136,7 @@ _fields_init(Eo *obj)
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, obj));
pd->ampm = efl_add(EFL_UI_BUTTON_CLASS, obj,
- efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _field_changed_cb, obj),
+ efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _field_changed_cb, obj),
elm_widget_element_update(obj, efl_added, "button"));
pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj);
diff --git a/src/lib/elementary/elc_multibuttonentry.c b/src/lib/elementary/elc_multibuttonentry.c
index 3c7e26c216..9bcb64514e 100644
--- a/src/lib/elementary/elc_multibuttonentry.c
+++ b/src/lib/elementary/elc_multibuttonentry.c
@@ -67,7 +67,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
{ ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
{ EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_changed_cb },
- { EFL_UI_EVENT_CLICKED, _entry_clicked_cb }
+ { EFL_INPUT_EVENT_CLICKED, _entry_clicked_cb }
);
EOLIAN static void
diff --git a/src/lib/elementary/elc_naviframe.c b/src/lib/elementary/elc_naviframe.c
index e2be2f5464..862edec01c 100644
--- a/src/lib/elementary/elc_naviframe.c
+++ b/src/lib/elementary/elc_naviframe.c
@@ -1499,7 +1499,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
///Leave for compatibility.
ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
if (it->title_prev_btn)
- efl_event_callback_legacy_call(it->title_prev_btn, EFL_UI_EVENT_CLICKED, NULL);
+ efl_event_callback_legacy_call(it->title_prev_btn, EFL_INPUT_EVENT_CLICKED, NULL);
return EINA_TRUE;
}
diff --git a/src/lib/elementary/elm_bubble_eo.c b/src/lib/elementary/elm_bubble_eo.c
index 4f6ee165a3..24780aacf0 100644
--- a/src/lib/elementary/elm_bubble_eo.c
+++ b/src/lib/elementary/elm_bubble_eo.c
@@ -50,6 +50,6 @@ static const Efl_Class_Description _elm_bubble_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_bubble_class_get, &_elm_bubble_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_bubble_eo.legacy.c"
diff --git a/src/lib/elementary/elm_calendar.c b/src/lib/elementary/elm_calendar.c
index b249fd44fe..74619d4a65 100644
--- a/src/lib/elementary/elm_calendar.c
+++ b/src/lib/elementary/elm_calendar.c
@@ -74,9 +74,9 @@ static void
_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED);
EFL_CALLBACKS_ARRAY_DEFINE( _inc_dec_button_cb,
- { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
- { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb},
- { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}
+ { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
+ { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
+ { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}
);
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);
diff --git a/src/lib/elementary/elm_color_class.c b/src/lib/elementary/elm_color_class.c
index cd85f52175..962e16f178 100644
--- a/src/lib/elementary/elm_color_class.c
+++ b/src/lib/elementary/elm_color_class.c
@@ -750,7 +750,7 @@ elm_color_class_editor_add(Evas_Object *obj)
elm_object_text_set(bt, "Reset");
elm_object_part_content_set(ly, "elm.swallow.reset", bt);
efl_event_callback_add
- (bt, EFL_UI_EVENT_CLICKED, _colorclass_reset, cc);
+ (bt, EFL_INPUT_EVENT_CLICKED, _colorclass_reset, cc);
cc->cs = cs = elm_colorselector_add(ly);
elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);
diff --git a/src/lib/elementary/elm_colorselector.c b/src/lib/elementary/elm_colorselector.c
index 2ca5b09c5d..5b40c537cd 100644
--- a/src/lib/elementary/elm_colorselector.c
+++ b/src/lib/elementary/elm_colorselector.c
@@ -1287,7 +1287,7 @@ _color_bars_add(Evas_Object *obj)
edje_object_part_swallow
(sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
efl_event_callback_add
- (sd->cb_data[i]->lbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
+ (sd->cb_data[i]->lbt, EFL_INPUT_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
elm_button_autorepeat_set(sd->cb_data[i]->lbt, EINA_TRUE);
elm_button_autorepeat_initial_timeout_set
(sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
@@ -1305,7 +1305,7 @@ _color_bars_add(Evas_Object *obj)
edje_object_part_swallow
(sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
efl_event_callback_add
- (sd->cb_data[i]->rbt, EFL_UI_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
+ (sd->cb_data[i]->rbt, EFL_INPUT_EVENT_CLICKED, _button_clicked_cb, sd->cb_data[i]);
elm_button_autorepeat_set(sd->cb_data[i]->rbt, EINA_TRUE);
elm_button_autorepeat_initial_timeout_set
(sd->cb_data[i]->rbt, _elm_config->longpress_timeout);
diff --git a/src/lib/elementary/elm_colorselector_eo.c b/src/lib/elementary/elm_colorselector_eo.c
index b6b288a8cf..c7ce07fc82 100644
--- a/src/lib/elementary/elm_colorselector_eo.c
+++ b/src/lib/elementary/elm_colorselector_eo.c
@@ -146,6 +146,6 @@ static const Efl_Class_Description _elm_colorselector_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_colorselector_class_get, &_elm_colorselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_colorselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_diskselector_eo.c b/src/lib/elementary/elm_diskselector_eo.c
index d533a106eb..d4158c4e94 100644
--- a/src/lib/elementary/elm_diskselector_eo.c
+++ b/src/lib/elementary/elm_diskselector_eo.c
@@ -222,6 +222,6 @@ static const Efl_Class_Description _elm_diskselector_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_diskselector_class_get, &_elm_diskselector_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SCROLLABLE_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_diskselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_entry.c b/src/lib/elementary/elm_entry.c
index ad627a0dc7..22dcaff458 100644
--- a/src/lib/elementary/elm_entry.c
+++ b/src/lib/elementary/elm_entry.c
@@ -2665,7 +2665,7 @@ _entry_hover_anchor_clicked_do(Evas_Object *obj,
efl_event_callback_legacy_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
efl_event_callback_add
- (sd->anchor_hover.hover, EFL_UI_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
+ (sd->anchor_hover.hover, EFL_INPUT_EVENT_CLICKED, _anchor_hover_clicked_cb, obj);
/* FIXME: Should just check if there's any callback registered to
* the smart events instead. This is used to determine if anyone
diff --git a/src/lib/elementary/elm_entry_eo.c b/src/lib/elementary/elm_entry_eo.c
index 110de558bc..397a6b4ea7 100644
--- a/src/lib/elementary/elm_entry_eo.c
+++ b/src/lib/elementary/elm_entry_eo.c
@@ -1188,6 +1188,6 @@ static const Efl_Class_Description _elm_entry_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_entry_class_get, &_elm_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_TEXT_INTERFACE, EFL_ACCESS_EDITABLE_TEXT_INTERFACE, EFL_FILE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_SCROLLABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_entry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_fileselector_entry_eo.c b/src/lib/elementary/elm_fileselector_entry_eo.c
index 04af297c98..3f6e17a701 100644
--- a/src/lib/elementary/elm_fileselector_entry_eo.c
+++ b/src/lib/elementary/elm_fileselector_entry_eo.c
@@ -88,4 +88,4 @@ static const Efl_Class_Description _elm_fileselector_entry_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_fileselector_entry_class_get, &_elm_fileselector_entry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_fileselector_eo.c b/src/lib/elementary/elm_fileselector_eo.c
index 3ae6cd3539..e6b7d726f4 100644
--- a/src/lib/elementary/elm_fileselector_eo.c
+++ b/src/lib/elementary/elm_fileselector_eo.c
@@ -202,6 +202,6 @@ static const Efl_Class_Description _elm_fileselector_class_desc = {
_elm_fileselector_class_destructor
};
-EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_fileselector_class_get, &_elm_fileselector_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_FILESELECTOR_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_FOCUS_COMPOSITION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_fileselector_eo.legacy.c"
diff --git a/src/lib/elementary/elm_gengrid_eo.c b/src/lib/elementary/elm_gengrid_eo.c
index b3012a57b8..d927aae949 100644
--- a/src/lib/elementary/elm_gengrid_eo.c
+++ b/src/lib/elementary/elm_gengrid_eo.c
@@ -512,6 +512,6 @@ static const Efl_Class_Description _elm_gengrid_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_gengrid_class_get, &_elm_gengrid_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
#include "elm_gengrid_eo.legacy.c"
diff --git a/src/lib/elementary/elm_genlist_eo.c b/src/lib/elementary/elm_genlist_eo.c
index fd0d5216ab..b34ec2a352 100644
--- a/src/lib/elementary/elm_genlist_eo.c
+++ b/src/lib/elementary/elm_genlist_eo.c
@@ -681,6 +681,6 @@ static const Efl_Class_Description _elm_genlist_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_genlist_class_get, &_elm_genlist_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
#include "elm_genlist_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hover_eo.c b/src/lib/elementary/elm_hover_eo.c
index b5a1b20208..c36c6ccf3f 100644
--- a/src/lib/elementary/elm_hover_eo.c
+++ b/src/lib/elementary/elm_hover_eo.c
@@ -92,6 +92,6 @@ static const Efl_Class_Description _elm_hover_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_hover_class_get, &_elm_hover_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_FOCUS_LAYER_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_hover_eo.legacy.c"
diff --git a/src/lib/elementary/elm_hoversel_eo.c b/src/lib/elementary/elm_hoversel_eo.c
index de2f5371c5..52bb001c67 100644
--- a/src/lib/elementary/elm_hoversel_eo.c
+++ b/src/lib/elementary/elm_hoversel_eo.c
@@ -189,6 +189,6 @@ static const Efl_Class_Description _elm_hoversel_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_hoversel_class_get, &_elm_hoversel_class_desc, EFL_UI_BUTTON_LEGACY_CLASS, EFL_UI_SELECTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_hoversel_eo.legacy.c"
diff --git a/src/lib/elementary/elm_index_eo.c b/src/lib/elementary/elm_index_eo.c
index 862e228fa1..806f94ce0b 100644
--- a/src/lib/elementary/elm_index_eo.c
+++ b/src/lib/elementary/elm_index_eo.c
@@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_index_class_get, &_elm_index_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_index_eo.legacy.c"
diff --git a/src/lib/elementary/elm_list_eo.c b/src/lib/elementary/elm_list_eo.c
index 3da0cba750..32f0f77b92 100644
--- a/src/lib/elementary/elm_list_eo.c
+++ b/src/lib/elementary/elm_list_eo.c
@@ -363,6 +363,6 @@ static const Efl_Class_Description _elm_list_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_list_class_get, &_elm_list_class_desc, EFL_UI_LAYOUT_BASE_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
#include "elm_list_eo.legacy.c"
diff --git a/src/lib/elementary/elm_map_eo.c b/src/lib/elementary/elm_map_eo.c
index 0e522f4635..57a36a570d 100644
--- a/src/lib/elementary/elm_map_eo.c
+++ b/src/lib/elementary/elm_map_eo.c
@@ -360,6 +360,6 @@ static const Efl_Class_Description _elm_map_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_map_class_get, &_elm_map_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_UI_ZOOM_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_map_class_get, &_elm_map_class_desc, EFL_UI_WIDGET_CLASS, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, EFL_UI_ZOOM_INTERFACE, NULL);
#include "elm_map_eo.legacy.c"
diff --git a/src/lib/elementary/elm_menu.c b/src/lib/elementary/elm_menu.c
index 681ac2273d..551b9830b3 100644
--- a/src/lib/elementary/elm_menu.c
+++ b/src/lib/elementary/elm_menu.c
@@ -780,13 +780,13 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
if (menu_bar)
{
efl_event_callback_add
- (item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
+ (item->submenu.hv, EFL_INPUT_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style);
}
else
{
- efl_event_callback_del(item->submenu.hv, EFL_UI_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
+ efl_event_callback_del(item->submenu.hv, EFL_INPUT_EVENT_CLICKED, _hover_dismissed_cb, WIDGET(item));
snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style);
}
diff --git a/src/lib/elementary/elm_menu_eo.c b/src/lib/elementary/elm_menu_eo.c
index 4aaa856be8..f202d2e795 100644
--- a/src/lib/elementary/elm_menu_eo.c
+++ b/src/lib/elementary/elm_menu_eo.c
@@ -119,6 +119,6 @@ static const Efl_Class_Description _elm_menu_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_menu_class_get, &_elm_menu_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_WIDGET_FOCUS_MANAGER_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_menu_class_get, &_elm_menu_class_desc, EFL_UI_WIDGET_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_UI_WIDGET_FOCUS_MANAGER_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_menu_eo.legacy.c"
diff --git a/src/lib/elementary/elm_multibuttonentry_eo.c b/src/lib/elementary/elm_multibuttonentry_eo.c
index dcfb62778d..d8697d015f 100644
--- a/src/lib/elementary/elm_multibuttonentry_eo.c
+++ b/src/lib/elementary/elm_multibuttonentry_eo.c
@@ -219,6 +219,6 @@ static const Efl_Class_Description _elm_multibuttonentry_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_multibuttonentry_class_get, &_elm_multibuttonentry_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_multibuttonentry_eo.legacy.c"
diff --git a/src/lib/elementary/elm_photo_eo.c b/src/lib/elementary/elm_photo_eo.c
index 6c49b03515..6d46584a74 100644
--- a/src/lib/elementary/elm_photo_eo.c
+++ b/src/lib/elementary/elm_photo_eo.c
@@ -76,4 +76,4 @@ static const Efl_Class_Description _elm_photo_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_photo_class_get, &_elm_photo_class_desc, EFL_UI_WIDGET_CLASS, EFL_FILE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_photo_class_get, &_elm_photo_class_desc, EFL_UI_WIDGET_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_plug_eo.c b/src/lib/elementary/elm_plug_eo.c
index c40f883d22..292176d630 100644
--- a/src/lib/elementary/elm_plug_eo.c
+++ b/src/lib/elementary/elm_plug_eo.c
@@ -54,6 +54,6 @@ static const Efl_Class_Description _elm_plug_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_plug_class_get, &_elm_plug_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_plug_class_get, &_elm_plug_class_desc, EFL_UI_WIDGET_CLASS, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_LEGACY_INTERFACE, NULL);
#include "elm_plug_eo.legacy.c"
diff --git a/src/lib/elementary/elm_spinner.c b/src/lib/elementary/elm_spinner.c
index ba22b6fa06..c033e9a732 100644
--- a/src/lib/elementary/elm_spinner.c
+++ b/src/lib/elementary/elm_spinner.c
@@ -60,9 +60,9 @@ static void
_entry_activated_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb,
- { EFL_UI_EVENT_CLICKED, _inc_dec_button_clicked_cb},
- { EFL_UI_EVENT_PRESSED, _inc_dec_button_pressed_cb},
- { EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
+ { EFL_INPUT_EVENT_CLICKED, _inc_dec_button_clicked_cb},
+ { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
+ { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
{ EFL_EVENT_POINTER_MOVE, _inc_dec_button_mouse_move_cb }
);
@@ -1222,7 +1222,7 @@ _elm_spinner_efl_canvas_group_group_add(Eo *obj, Elm_Spinner_Data *priv)
elm_widget_can_focus_set(priv->text_button, _elm_config->access_mode);
efl_event_callback_add
- (priv->text_button, EFL_UI_EVENT_CLICKED, _text_button_clicked_cb, obj);
+ (priv->text_button, EFL_INPUT_EVENT_CLICKED, _text_button_clicked_cb, obj);
efl_event_callback_add
(priv->text_button, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_change, obj);
diff --git a/src/lib/elementary/elm_thumb_eo.c b/src/lib/elementary/elm_thumb_eo.c
index 0e57845112..d7a469060f 100644
--- a/src/lib/elementary/elm_thumb_eo.c
+++ b/src/lib/elementary/elm_thumb_eo.c
@@ -82,4 +82,4 @@ static const Efl_Class_Description _elm_thumb_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_thumb_class_get, &_elm_thumb_class_desc, EFL_UI_LAYOUT_BASE_CLASS, EFL_FILE_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_DRAGGABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, NULL);
diff --git a/src/lib/elementary/elm_toolbar_eo.c b/src/lib/elementary/elm_toolbar_eo.c
index f27ea9b4e4..bcb3b23c5f 100644
--- a/src/lib/elementary/elm_toolbar_eo.c
+++ b/src/lib/elementary/elm_toolbar_eo.c
@@ -372,6 +372,6 @@ static const Efl_Class_Description _elm_toolbar_class_desc = {
NULL
};
-EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_UI_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
+EFL_DEFINE_CLASS(elm_toolbar_class_get, &_elm_toolbar_class_desc, EFL_UI_WIDGET_CLASS, EFL_UI_FOCUS_COMPOSITION_MIXIN, ELM_INTERFACE_SCROLLABLE_MIXIN, EFL_UI_LAYOUT_ORIENTABLE_INTERFACE, EFL_ACCESS_WIDGET_ACTION_MIXIN, EFL_ACCESS_SELECTION_INTERFACE, EFL_ACCESS_OBJECT_MIXIN, EFL_INPUT_CLICKABLE_MIXIN, EFL_UI_SELECTABLE_INTERFACE, EFL_UI_LEGACY_INTERFACE, ELM_WIDGET_ITEM_CONTAINER_INTERFACE, NULL);
#include "elm_toolbar_eo.legacy.c"
diff --git a/src/lib/elementary/meson.build b/src/lib/elementary/meson.build
index 72226f5cf3..3216383f41 100644
--- a/src/lib/elementary/meson.build
+++ b/src/lib/elementary/meson.build
@@ -176,7 +176,6 @@ pub_eo_files = [
'efl_ui_caching_factory.eo',
'efl_ui_widget_factory.eo',
'efl_ui_relative_layout.eo',
- 'efl_ui_clickable.eo',
'efl_ui_clickable_util.eo',
'efl_ui_format.eo',
'efl_ui_collection.eo',
@@ -930,7 +929,6 @@ elementary_src = [
'efl_ui_exact_model.c',
'efl_ui_average_model.c',
'efl_ui_relative_layout.c',
- 'efl_ui_clickable.c',
'efl_ui_clickable_util.c',
'efl_ui_format.c',
'efl_ui_scroll_util.c',
diff --git a/src/lib/evas/Evas_Eo.h b/src/lib/evas/Evas_Eo.h
index 4122ac7f15..593c4d9a69 100644
--- a/src/lib/evas/Evas_Eo.h
+++ b/src/lib/evas/Evas_Eo.h
@@ -464,3 +464,4 @@ typedef void (Evas_Canvas3D_Surface_Func)(Evas_Real *out_x,
#include "canvas/efl_input_hold.eo.h"
#include "canvas/efl_input_interface.eo.h"
#include "canvas/efl_input_focus.eo.h"
+#include "canvas/efl_input_clickable.eo.h"
diff --git a/src/lib/elementary/efl_ui_clickable.c b/src/lib/evas/canvas/efl_input_clickable.c
index ced9609e35..fb6c3fe457 100644
--- a/src/lib/elementary/efl_ui_clickable.c
+++ b/src/lib/evas/canvas/efl_input_clickable.c
@@ -2,10 +2,11 @@
# include <config.h>
#endif
-#define EFL_UI_CLICKABLE_PROTECTED 1
+#define EFL_INPUT_CLICKABLE_PROTECTED 1
-#include <Efl_Ui.h>
-#include "elm_priv.h"
+#include <Evas.h>
+#include <Ecore.h>
+#include "evas_common_private.h"
typedef struct {
Eina_Bool pressed;
@@ -16,9 +17,9 @@ typedef struct {
typedef struct {
Button_State state[3];
-} Efl_Ui_Clickable_Data;
+} Efl_Input_Clickable_Data;
-#define MY_CLASS EFL_UI_CLICKABLE_MIXIN
+#define MY_CLASS EFL_INPUT_CLICKABLE_MIXIN
#define DOUBLE_CLICK_TIME ((double)0.1) //in seconds
#define LONGPRESS_TIMEOUT ((double)1.0) //in seconds
@@ -27,7 +28,7 @@ static void
_timer_longpress(void *data, const Efl_Event *ev)
{
Button_State *state;
- Efl_Ui_Clickable_Data *pd = efl_data_scope_get(data, MY_CLASS);
+ Efl_Input_Clickable_Data *pd = efl_data_scope_get(data, MY_CLASS);
for (int i = 0; i < 3; ++i)
{
@@ -36,13 +37,13 @@ _timer_longpress(void *data, const Efl_Event *ev)
{
efl_del(state->timer);
state->timer = NULL;
- efl_event_callback_call(data, EFL_UI_EVENT_LONGPRESSED, &i);
+ efl_event_callback_call(data, EFL_INPUT_EVENT_LONGPRESSED, &i);
}
}
}
EOLIAN static void
-_efl_ui_clickable_press(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button)
+_efl_input_clickable_press(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
{
Button_State *state;
EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -58,13 +59,13 @@ _efl_ui_clickable_press(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned
efl_loop_timer_interval_set(efl_added, LONGPRESS_TIMEOUT),
efl_event_callback_add(efl_added, EFL_LOOP_TIMER_EVENT_TIMER_TICK, _timer_longpress, obj));
- efl_event_callback_call(obj, EFL_UI_EVENT_PRESSED, &button);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_PRESSED, &button);
}
EOLIAN static void
-_efl_ui_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button)
+_efl_input_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
{
- Efl_Ui_Clickable_Clicked clicked;
+ Efl_Input_Clickable_Clicked clicked;
Button_State *state;
Eina_Bool pressed;
EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -88,20 +89,20 @@ _efl_ui_clickable_unpress(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsign
state->timer = NULL;
//populate state
- efl_event_callback_call(obj, EFL_UI_EVENT_UNPRESSED, &button);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_UNPRESSED, &button);
if (pressed)
{
INF("Widget %s,%p is clicked(%d)", efl_class_name_get(obj), obj, button);
clicked.repeated = state->pressed_before;
clicked.button = button;
if (button == 1)
- efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, &clicked);
- efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED_ANY, &clicked);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, &clicked);
+ efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED_ANY, &clicked);
}
}
EOLIAN static void
-_efl_ui_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data *pd, unsigned int button)
+_efl_input_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Input_Clickable_Data *pd, unsigned int button)
{
Button_State *state;
EINA_SAFETY_ON_FALSE_RETURN(button < 3);
@@ -117,4 +118,4 @@ _efl_ui_clickable_button_state_reset(Eo *obj EINA_UNUSED, Efl_Ui_Clickable_Data
state->pressed = EINA_FALSE;
}
-#include "efl_ui_clickable.eo.c"
+#include "efl_input_clickable.eo.c"
diff --git a/src/lib/elementary/efl_ui_clickable.eo b/src/lib/evas/canvas/efl_input_clickable.eo
index ace6f6d6e7..14ca084d37 100644
--- a/src/lib/elementary/efl_ui_clickable.eo
+++ b/src/lib/evas/canvas/efl_input_clickable.eo
@@ -1,13 +1,13 @@
-struct @beta Efl.Ui.Clickable_Clicked {
+struct @beta Efl.Input.Clickable_Clicked {
[[A struct that expresses a click in elementary.]]
repeated : int; [[The amount of how often the clicked event was repeated in a certain amount of time]]
button : int; [[The Button that is pressed]]
}
-mixin @beta Efl.Ui.Clickable
+mixin @beta Efl.Input.Clickable
{
- [[Efl UI clickable interface]]
- event_prefix: efl_ui;
+ [[Efl input clickable interface]]
+ event_prefix: efl_input;
methods {
press @protected {
[[Change internal states that a button got pressed.
@@ -38,8 +38,8 @@ mixin @beta Efl.Ui.Clickable
}
}
events {
- clicked: Efl.Ui.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed, by the primary button]]
- clicked,any : Efl.Ui.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed by any button. The button that triggered the event can be found in the event information.]]
+ clicked: Efl.Input.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed, by the primary button]]
+ clicked,any: Efl.Input.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed by any button. The button that triggered the event can be found in the event information.]]
pressed: int; [[Called when the object is pressed, event_info is the button that got pressed]]
unpressed: int; [[Called when the object is no longer pressed, event_info is the button that got pressed]]
longpressed: int; [[Called when the object receives a long press, event_info is the button that got pressed]]
diff --git a/src/lib/evas/canvas/meson.build b/src/lib/evas/canvas/meson.build
index f285316844..c306c900a3 100644
--- a/src/lib/evas/canvas/meson.build
+++ b/src/lib/evas/canvas/meson.build
@@ -27,6 +27,7 @@ pub_eo_files = [
'efl_input_pointer.eo',
'efl_input_hold.eo',
'efl_input_focus.eo',
+ 'efl_input_clickable.eo',
'efl_canvas_animation.eo',
'efl_canvas_animation_alpha.eo',
'efl_canvas_animation_rotate.eo',
@@ -168,6 +169,7 @@ evas_src += files([
'efl_input_pointer.c',
'efl_input_hold.c',
'efl_input_focus.c',
+ 'efl_input_clickable.c',
'efl_canvas_animation.c',
'efl_canvas_animation_alpha.c',
'efl_canvas_animation_rotate.c',
diff --git a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
index 03b5a7f20a..d92a08618d 100644
--- a/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
+++ b/src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
@@ -317,7 +317,7 @@ field_create(Efl_Ui_Clock_Module_Data *module_data, Efl_Ui_Clock_Type field_typ
{
field_obj = elm_button_add(ctx_mod->mod_data.base);
efl_event_callback_add
- (field_obj, EFL_UI_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
+ (field_obj, EFL_INPUT_EVENT_CLICKED, _ampm_clicked_cb, ctx_mod);
}
else
{
@@ -327,7 +327,7 @@ field_create(Efl_Ui_Clock_Module_Data *module_data, Efl_Ui_Clock_Type field_typ
elm_entry_input_panel_enabled_set(field_obj, EINA_FALSE);
elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
efl_event_callback_add
- (field_obj, EFL_UI_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
+ (field_obj, EFL_INPUT_EVENT_CLICKED, _field_clicked_cb, ctx_mod);
}
evas_object_data_set(field_obj, "_field_type", (void *)field_type);
diff --git a/src/tests/elementary/spec/efl_test_clickable.c b/src/tests/elementary/spec/efl_test_clickable.c
index c1b63d38b7..c6ca54883b 100644
--- a/src/tests/elementary/spec/efl_test_clickable.c
+++ b/src/tests/elementary/spec/efl_test_clickable.c
@@ -69,9 +69,9 @@ prepare_window(void)
*/
typedef struct {
- Efl_Ui_Clickable_Clicked clicked_params;
+ Efl_Input_Clickable_Clicked clicked_params;
unsigned int clicked;
- Efl_Ui_Clickable_Clicked clicked_all_params;
+ Efl_Input_Clickable_Clicked clicked_all_params;
unsigned int clicked_all;
unsigned int pressed;
unsigned int unpressed;
@@ -84,23 +84,23 @@ Clickable_Event_Register event_caller = { 0 };
static void
_event_register(void *data EINA_UNUSED, const Efl_Event *ev)
{
-#define EVENT_CHECK(e,f) if (ev->desc == EFL_UI_EVENT_ ##e ) event_caller.f ++
+#define EVENT_CHECK(e,f) if (ev->desc == EFL_INPUT_EVENT_ ##e ) event_caller.f ++
EVENT_CHECK(CLICKED, clicked);
EVENT_CHECK(CLICKED_ANY, clicked_all);
EVENT_CHECK(PRESSED, pressed);
EVENT_CHECK(UNPRESSED, unpressed);
EVENT_CHECK(LONGPRESSED, long_pressed);
- if (ev->desc == EFL_UI_EVENT_CLICKED)
+ if (ev->desc == EFL_INPUT_EVENT_CLICKED)
{
- Efl_Ui_Clickable_Clicked *clicked = ev->info;
+ Efl_Input_Clickable_Clicked *clicked = ev->info;
event_caller.clicked_params.repeated = clicked->repeated;
event_caller.clicked_params.button = clicked->button;
}
- if (ev->desc == EFL_UI_EVENT_CLICKED_ANY)
+ if (ev->desc == EFL_INPUT_EVENT_CLICKED_ANY)
{
- Efl_Ui_Clickable_Clicked *clicked = ev->info;
+ Efl_Input_Clickable_Clicked *clicked = ev->info;
event_caller.clicked_all_params.repeated = clicked->repeated;
event_caller.clicked_all_params.button = clicked->button;
@@ -108,11 +108,11 @@ _event_register(void *data EINA_UNUSED, const Efl_Event *ev)
}
EFL_CALLBACKS_ARRAY_DEFINE(clickable,
- {EFL_UI_EVENT_CLICKED, _event_register},
- {EFL_UI_EVENT_CLICKED_ANY, _event_register},
- {EFL_UI_EVENT_PRESSED, _event_register},
- {EFL_UI_EVENT_UNPRESSED, _event_register},
- {EFL_UI_EVENT_LONGPRESSED, _event_register},
+ {EFL_INPUT_EVENT_CLICKED, _event_register},
+ {EFL_INPUT_EVENT_CLICKED_ANY, _event_register},
+ {EFL_INPUT_EVENT_PRESSED, _event_register},
+ {EFL_INPUT_EVENT_UNPRESSED, _event_register},
+ {EFL_INPUT_EVENT_LONGPRESSED, _event_register},
)
static void