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

efl_input_clickable: rename efl_ui_clickable to efl_input_clickable 

Summary:
Renamed all efl_ui_clickable_XXX to efl_input_clickable_XXX based on
the discussion in T7847

ref T7847 T7976

Reviewers: zmike, bu5hm4n, segfaultxavi

Reviewed By: segfaultxavi

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Maniphest Tasks: T7976, T7847

Differential Revision: https://phab.enlightenment.org/D9427
This commit is contained in:
WooHyun Jung 2019-07-29 11:42:34 +02:00 committed by Xavi Artigas
parent 9b294d6284
commit 77e268e6ab
94 changed files with 370 additions and 370 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/bin/elementary/test_bg.c
View File

@ -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_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5), 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)); efl_pack(box, efl_added));
snprintf(buf, sizeof(buf), "%s/images/sky_04.jpg", elm_app_data_dir_get()); 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_file_set(efl_added, buf),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)), efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(64, 64)),
efl_gfx_hint_align_set(efl_added, 0.5, 0.5), 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_pack(box, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));

10
src/bin/elementary/test_efl_ui_text.c
View File

@ -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); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Sel"); 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_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt); efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Wr"); 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_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt); efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE); 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); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Image"); 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_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt); efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Emoticon"); 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_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt); efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE);
bt = efl_add(EFL_UI_BUTTON_CLASS, bx2); bt = efl_add(EFL_UI_BUTTON_CLASS, bx2);
efl_text_set(bt, "Factory"); 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_gfx_hint_weight_set(bt, EFL_GFX_HINT_EXPAND, 0.0);
efl_pack(bx2, bt); efl_pack(bx2, bt);
elm_object_focus_allow_set(bt, EINA_FALSE); elm_object_focus_allow_set(bt, EINA_FALSE);

6
src/bin/elementary/test_evas_mask.c
View File

@ -182,19 +182,19 @@ test_evas_mask(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
// FIXME: button EO API // FIXME: button EO API
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle mask (image)"), 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_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added)); efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Toggle map"), 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_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added)); efl_pack(box2, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Rotate Window"), 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_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_pack(box2, efl_added)); efl_pack(box2, efl_added));

8
src/bin/elementary/test_evas_snapshot.c
View File

@ -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_text_set(efl_added, "Toggle animation"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added), 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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Save to file"), efl_text_set(efl_added, "Save to file"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added), 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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Map"), efl_text_set(efl_added, "Map"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added), 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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Close"), efl_text_set(efl_added, "Close"),
efl_gfx_hint_weight_set(efl_added, 1.0, 0.0), efl_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack(box, efl_added), 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, "snap", snap);
efl_key_wref_set(win, "table", table); efl_key_wref_set(win, "table", table);

4
src/bin/elementary/test_events.c
View File

@ -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); o = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);
efl_pack(bx, o); 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_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_add(win, EFL_EVENT_DEL, _win_del, td);
efl_event_callback_array_add(o, rect_pointer_callbacks(), td); efl_event_callback_array_add(o, rect_pointer_callbacks(), td);
efl_event_callback_array_add(win, win_key_callbacks(), td); efl_event_callback_array_add(win, win_key_callbacks(), td);

4
src/bin/elementary/test_gfx_filters.c
View File

@ -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_text_set(efl_added, "Flip"),
efl_gfx_hint_weight_set(efl_added, 0.0, 1.0), efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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); 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)); elm_object_tooltip_text_set(efl_added, images[k].src_name));
if (efl_player_playable_get(o)) if (efl_player_playable_get(o))
efl_player_play_set(o, 1); 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); efl_pack(box2, o);
} }

6
src/bin/elementary/test_part_bg.c
View File

@ -181,9 +181,9 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
radio_group = _create_box_contents(vbox); radio_group = _create_box_contents(vbox);
efl_event_callback_add(reset_btn, EFL_UI_EVENT_CLICKED, _reset_cb, radio_group); efl_event_callback_add(reset_btn, EFL_INPUT_EVENT_CLICKED, _reset_cb, radio_group);
efl_event_callback_add(color_btn, EFL_UI_EVENT_CLICKED, _color_cb, radio_group); efl_event_callback_add(color_btn, EFL_INPUT_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(scale_btn, EFL_INPUT_EVENT_CLICKED, _scale_type_cb, radio_group);
efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200)); efl_gfx_entity_size_set(win, EINA_SIZE2D(300, 200));
} }

4
src/bin/elementary/test_part_shadow.c
View File

@ -181,12 +181,12 @@ test_part_shadow(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_pack(bx, bt_bx); efl_pack(bx, bt_bx);
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Start")); 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); efl_pack(bt_bx, bt);
td->btn_start = bt; td->btn_start = bt;
bt = efl_add(EFL_UI_BUTTON_CLASS, win, efl_text_set(efl_added, "Stop")); 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_ui_widget_disabled_set(bt, EINA_TRUE);
efl_pack(bt_bx, bt); efl_pack(bt_bx, bt);
td->btn_stop = bt; td->btn_stop = bt;

2
src/bin/elementary/test_photocam.c
View File

@ -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_set(efl_added, buf),
efl_file_load(efl_added), efl_file_load(efl_added),
efl_pack(bx, 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)) if (efl_player_playable_get(zoomable))

18
src/bin/elementary/test_ui_button.c
View File

@ -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_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text"), efl_text_set(efl_added, "Text"),
efl_pack(bx, efl_added), efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), efl_event_callback_add(efl_added, EFL_INPUT_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_UNPRESSED, _unpressed, NULL)
); );
// Icon Only Button // Icon Only Button
snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get()); snprintf(buf, sizeof(buf), "%s/images/logo_small.png", elm_app_data_dir_get());
btn = efl_add(EFL_UI_BUTTON_CLASS, bx, btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_pack(bx, efl_added), efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), efl_event_callback_add(efl_added, EFL_INPUT_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_UNPRESSED, _unpressed, NULL)
); );
efl_add(EFL_UI_IMAGE_CLASS, btn, efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Text + Icon"), efl_text_set(efl_added, "Text + Icon"),
efl_pack(bx, efl_added), efl_pack(bx, efl_added),
efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, _clicked, NULL), efl_event_callback_add(efl_added, EFL_INPUT_EVENT_CLICKED, _clicked, NULL),
efl_event_callback_add(efl_added, EFL_UI_EVENT_PRESSED, _pressed, NULL), efl_event_callback_add(efl_added, EFL_INPUT_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_UNPRESSED, _unpressed, NULL)
); );
efl_add(EFL_UI_IMAGE_CLASS, btn, efl_add(EFL_UI_IMAGE_CLASS, btn,
efl_file_set(efl_added, buf), efl_file_set(efl_added, buf),

2
src/bin/elementary/test_ui_clock.c
View File

@ -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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Back to the future..."), 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)); efl_pack(bx, efl_added));
} }

4
src/bin/elementary/test_ui_image.c
View File

@ -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, bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Reload"), 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); efl_pack(hbox, bt);
bt = efl_add(EFL_UI_BUTTON_CLASS, win, bt = efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Image Switch"), 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); efl_pack(hbox, bt);
} }

12
src/bin/elementary/test_ui_item_container.c
View File

@ -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_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 1154 ANIMATED"); 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); efl_pack_table(tbl, o, 0, 1, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl, o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Scroll to 10"); 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); efl_pack_table(tbl, o, 0, 2, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl, o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Change min size of 0"); 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); efl_pack_table(tbl, o, 0, 3, 1, 1);
o = efl_add(EFL_UI_CHECK_CLASS, tbl, 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_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Remove all items"); 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); efl_pack_table(tbl, o, 0, 7, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl, o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1 item"); 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); efl_pack_table(tbl, o, 0, 8, 1, 1);
o = efl_add(EFL_UI_BUTTON_CLASS, tbl, o = efl_add(EFL_UI_BUTTON_CLASS, tbl,
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0), efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5)); efl_gfx_hint_align_set(efl_added, 0, 0.5));
efl_text_set(o, "Add 1000 item"); 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); efl_pack_table(tbl, o, 0, 9, 1, 1);
bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl, bx = efl_add(EFL_UI_RADIO_BOX_CLASS, tbl,

32
src/bin/elementary/test_ui_pager.c
View File

@ -337,7 +337,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -496,7 +496,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -514,7 +514,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -532,7 +532,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), 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_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -569,7 +569,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn; pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT; 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); pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL, efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param); pack_btn_del_cb, pack_param);
@ -603,7 +603,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi, box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -656,7 +656,7 @@ static void current_page_cb(void *data,
psp->pager = pager; psp->pager = pager;
psp->spinner = sp; 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); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"), 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), indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"), 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), indicator_none_btn_cb, params),
efl_pack_end(box, efl_added)); 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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"), efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added, 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_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout, efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"), efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added, 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)); efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params)); params = calloc(1, sizeof(Params));

40
src/bin/elementary/test_ui_pager_scroll.c
View File

@ -391,7 +391,7 @@ static void page_size_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -608,7 +608,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -626,7 +626,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -644,7 +644,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), 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_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -681,7 +681,7 @@ static void pack_cb(void *data,
pack_param->unpack_btn = btn; pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT; 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); pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL, efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param); pack_btn_del_cb, pack_param);
@ -715,7 +715,7 @@ static void pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi, box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -767,7 +767,7 @@ static void current_page_cb(void *data,
psp->pager = pager; psp->pager = pager;
psp->spinner = sp; 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); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_RADIO_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"), 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), indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"), 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), indicator_none_btn_cb, params),
efl_pack_end(box, efl_added)); 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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"), efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added, 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_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout, efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"), efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added, 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)); efl_content_set(efl_part(layout, "next_btn"), efl_added));
tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager, tran = efl_add(EFL_PAGE_TRANSITION_SCROLL_CLASS, pager,

2
src/bin/elementary/test_ui_panel.c
View File

@ -154,7 +154,7 @@ test_ui_panel2(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_content_set(panel, list); efl_content_set(panel, list);
efl_event_callback_add(panel, EFL_UI_PANEL_EVENT_TOGGLED, _panel_toggled, check); 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)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 400));
} }

82
src/bin/elementary/test_ui_popup.c
View File

@ -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_position_set(repeat_test_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100)); efl_gfx_entity_size_set(repeat_test_btn, EINA_SIZE2D(100, 100));
efl_text_set(repeat_test_btn, "Repeat Event Test"); 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); efl_gfx_entity_visible_set(repeat_test_btn, EINA_FALSE);
p_data->win = win; 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_text_set(create_btn, "Create Popup");
efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0)); efl_gfx_entity_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(150, 50)); 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); Eo *delete_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(delete_btn, "Delete Popup"); efl_text_set(delete_btn, "Delete Popup");
efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0)); efl_gfx_entity_position_set(delete_btn, EINA_POSITION2D(150, 0));
efl_gfx_entity_size_set(delete_btn, EINA_SIZE2D(150, 50)); 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); Eo *repeat_event_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(repeat_event_btn, "Repeat Event Set"); efl_text_set(repeat_event_btn, "Repeat Event Set");
efl_gfx_entity_position_set(repeat_event_btn, EINA_POSITION2D(0, 50)); 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_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); Eo *dummy_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(dummy_btn, "Show Dummy Button"); efl_text_set(dummy_btn, "Show Dummy Button");
efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50)); efl_gfx_entity_position_set(dummy_btn, EINA_POSITION2D(150, 50));
efl_gfx_entity_size_set(dummy_btn, EINA_SIZE2D(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); 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_position_set(backwall_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50)); efl_gfx_entity_size_set(backwall_btn, EINA_SIZE2D(150, 50));
efl_text_set(backwall_btn, "Backwall Set"); 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); Eo *timeout_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(timeout_btn, "Timeout Set"); efl_text_set(timeout_btn, "Timeout Set");
efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100)); efl_gfx_entity_position_set(timeout_btn, EINA_POSITION2D(150, 100));
efl_gfx_entity_size_set(timeout_btn, EINA_SIZE2D(150, 50)); 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); Eo *center_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(center_btn, "Center Align"); efl_text_set(center_btn, "Center Align");
efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150)); efl_gfx_entity_position_set(center_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(center_btn, EINA_SIZE2D(150, 50)); 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); Eo *top_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(top_btn, "Top Align"); efl_text_set(top_btn, "Top Align");
efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150)); efl_gfx_entity_position_set(top_btn, EINA_POSITION2D(150, 150));
efl_gfx_entity_size_set(top_btn, EINA_SIZE2D(150, 50)); 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); Eo *left_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(left_btn, "Left Align"); efl_text_set(left_btn, "Left Align");
efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200)); efl_gfx_entity_position_set(left_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(left_btn, EINA_SIZE2D(150, 50)); 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); Eo *right_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(right_btn, "Right Align"); efl_text_set(right_btn, "Right Align");
efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200)); efl_gfx_entity_position_set(right_btn, EINA_POSITION2D(150, 200));
efl_gfx_entity_size_set(right_btn, EINA_SIZE2D(150, 50)); 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); Eo *bottom_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(bottom_btn, "Bottom Align"); efl_text_set(bottom_btn, "Bottom Align");
efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250)); efl_gfx_entity_position_set(bottom_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(bottom_btn, EINA_SIZE2D(150, 50)); 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); Eo *position_btn = efl_add(EFL_UI_BUTTON_CLASS, panel_win);
efl_text_set(position_btn, "Position Set (x:0, y:0)"); 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_position_set(position_btn, EINA_POSITION2D(150, 250));
efl_gfx_entity_size_set(position_btn, EINA_SIZE2D(150, 50)); 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 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_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_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); 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_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_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 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); 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_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_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); 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_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_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); 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_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_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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 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_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_position_set(create_btn, EINA_POSITION2D(0, 0));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "2. size(200,200), text(long), expand(-1,-1)"); 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_position_set(create_btn, EINA_POSITION2D(0, 50));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "3. size(200,200), text(short), expand(300,300)"); 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_position_set(create_btn, EINA_POSITION2D(0, 100));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "4. size(200,200), text(short), expand(300,-1)"); 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_position_set(create_btn, EINA_POSITION2D(0, 150));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "5. size(200,200), text(short), expand(-1,300)"); 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_position_set(create_btn, EINA_POSITION2D(0, 200));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "6. size(200,200), text(long), expand(300,300)"); 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_position_set(create_btn, EINA_POSITION2D(0, 250));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "7. size(200,200), text(long), expand(300,-1)"); 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_position_set(create_btn, EINA_POSITION2D(0, 300));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "8. size(200,200), text(long), expand(-1,300)"); 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_position_set(create_btn, EINA_POSITION2D(0, 350));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "9. size(200,200), text(long), expand(10, 10)"); 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_position_set(create_btn, EINA_POSITION2D(0, 400));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "10. size(200,200), text(long), expand(150,150)"); 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_position_set(create_btn, EINA_POSITION2D(0, 450));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "11. size(200,200), text(long), expand(150,-1)"); 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_position_set(create_btn, EINA_POSITION2D(0, 500));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "12. size(200,200), text(long), expand(300,-1)"); 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_position_set(create_btn, EINA_POSITION2D(0, 550));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "13. size(200,200), text(long), expand(-1,150)"); 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_position_set(create_btn, EINA_POSITION2D(0, 600));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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); create_btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(create_btn, "14. size(200,200), text(long), expand(-1,300)"); 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_position_set(create_btn, EINA_POSITION2D(0, 650));
efl_gfx_entity_size_set(create_btn, EINA_SIZE2D(500, 50)); 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 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); btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor"); efl_text_set(btn, "anchor");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 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); snprintf(buf, sizeof(buf), "anchor%d", i+1);
efl_content_set(efl_part(layout, buf), btn); 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); btn = efl_add(EFL_UI_BUTTON_CLASS, win);
efl_text_set(btn, "anchor none"); efl_text_set(btn, "anchor none");
efl_gfx_hint_weight_set(btn, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 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); efl_content_set(efl_part(layout, "anchor_none"), btn);
Eo *table = efl_add(EFL_UI_TABLE_CLASS, efl_ui_popup); 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); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Center Align"); efl_text_set(btn, "Center Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 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); efl_pack_table(table, btn, 0, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Top Align"); efl_text_set(btn, "Top Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 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); efl_pack_table(table, btn, 2, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Bottom Align"); efl_text_set(btn, "Bottom Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(70, 35)); 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); efl_pack_table(table, btn, 4, 0, 2, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Left Align"); efl_text_set(btn, "Left Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 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); efl_pack_table(table, btn, 0, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Right Align"); efl_text_set(btn, "Right Align");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 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); efl_pack_table(table, btn, 3, 1, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Position Set"); efl_text_set(btn, "Position Set");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 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); efl_pack_table(table, btn, 0, 2, 3, 1);
btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup); btn = efl_add(EFL_UI_BUTTON_CLASS, efl_ui_popup);
efl_text_set(btn, "Resize"); efl_text_set(btn, "Resize");
efl_gfx_hint_size_min_set(btn, EINA_SIZE2D(100, 35)); 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_pack_table(table, btn, 3, 2, 3, 1);
efl_content_set(efl_ui_popup, table); efl_content_set(efl_ui_popup, table);

6
src/bin/elementary/test_ui_progressbar.c
View File

@ -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, pd->btn_start = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "start"), 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), _start_btn_clicked_cb, pd),
efl_pack(btbx, efl_added) efl_pack(btbx, efl_added)
); );
pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx, pd->btn_stop = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "stop"), 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), _stop_btn_clicked_cb, pd),
efl_pack(btbx, efl_added) efl_pack(btbx, efl_added)
); );
pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx, pd->btn_reset = efl_add(EFL_UI_BUTTON_CLASS, btbx,
efl_text_set(efl_added, "reset"), 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), _reset_btn_clicked_cb, pd),
efl_pack(btbx, efl_added) efl_pack(btbx, efl_added)
); );

6
src/bin/elementary/test_ui_radio.c
View File

@ -119,18 +119,18 @@ void test_efl_ui_radio(void *data EINA_UNUSED,
o = efl_add(EFL_UI_BUTTON_CLASS, table); o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 0, 1, 1); efl_pack_table(table, o, 1, 0, 1, 1);
efl_text_set(o, "Selected France check"); 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); o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 1, 1, 1); efl_pack_table(table, o, 1, 1, 1, 1);
efl_text_set(o, "Set value for Germany"); 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); o = efl_add(EFL_UI_BUTTON_CLASS, table);
efl_pack_table(table, o, 1, 2, 1, 1); efl_pack_table(table, o, 1, 2, 1, 1);
efl_text_set(o, "Set object for UK"); efl_text_set(o, "Set object for UK");
efl_key_data_set(o, "uk", 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); eina_array_free(arr);
} }

4
src/bin/elementary/test_ui_relative_layout.c
View File

@ -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, "to", to),
efl_key_wref_set(efl_added, "btn", btn), efl_key_wref_set(efl_added, "btn", btn),
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND), 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_pack(hbox, efl_added));
efl_add(EFL_UI_SLIDER_CLASS, hbox, 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, btn1 = efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "button1"), efl_text_set(efl_added, "button1"),
efl_gfx_hint_align_set(efl_added, 0.0, 0.0), 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_right_set(layout, efl_added, layout, 0.0),
efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0)); efl_ui_relative_layout_relation_bottom_set(layout, efl_added, layout, 0.0));

16
src/bin/elementary/test_ui_scroller.c
View File

@ -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_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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)); 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_add(EFL_UI_BUTTON_CLASS, bx2,
efl_text_set(efl_added, "... Horizontal scrolling ..."), 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)); 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_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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)); 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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Both"), 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)); 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_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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)); 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_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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)); 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_text_set(efl_added, "Vertical"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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_pack_table(tb, efl_added, 0, i, 1, 1));
efl_add(EFL_UI_BUTTON_CLASS, tb, efl_add(EFL_UI_BUTTON_CLASS, tb,
efl_text_set(efl_added, "Horizontal"), efl_text_set(efl_added, "Horizontal"),
efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0), efl_gfx_hint_weight_set(efl_added, EVAS_HINT_EXPAND, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE), 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)); efl_pack_table(tb, efl_added, 1, i, 1, 1));
} }
} }

4
src/bin/elementary/test_ui_spin.c
View File

@ -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_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Increse Spinner value"), 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_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, bx, efl_add(EFL_UI_BUTTON_CLASS, bx,
efl_text_set(efl_added, "Decrease Spinner value"), 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_pack(bx, efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120)); efl_gfx_entity_size_set(win, EINA_SIZE2D(100, 120));

44
src/bin/elementary/test_ui_spotlight.c
View File

@ -101,7 +101,7 @@ view_add(View_Type p, Eo *parent)
case BUTTON: case BUTTON:
page = efl_add(EFL_UI_BUTTON_CLASS, parent, page = efl_add(EFL_UI_BUTTON_CLASS, parent,
efl_text_set(efl_added, "Button Page")); 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); efl_gfx_hint_fill_set(page, EINA_TRUE, EINA_TRUE);
break; break;
@ -370,7 +370,7 @@ spotlight_size(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -567,7 +567,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -585,7 +585,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -603,7 +603,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Page"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -621,7 +621,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, in_box1, efl_add(EFL_UI_BUTTON_CLASS, in_box1,
efl_text_set(efl_added, "Pack At"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -640,7 +640,7 @@ pack_cb(void *data,
pack_param->unpack_btn = btn; pack_param->unpack_btn = btn;
pack_param->type = UNPACK_AT; 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); pack_btn_cb, pack_param);
efl_event_callback_add(btn, EFL_EVENT_DEL, efl_event_callback_add(btn, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param); pack_btn_del_cb, pack_param);
@ -674,7 +674,7 @@ pack_cb(void *data,
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"), 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), pack_btn_cb, pack_param),
efl_event_callback_add(efl_added, EFL_EVENT_DEL, efl_event_callback_add(efl_added, EFL_EVENT_DEL,
pack_btn_del_cb, pack_param), pack_btn_del_cb, pack_param),
@ -695,7 +695,7 @@ active_index_cb(void *data,
btn = efl_add(EFL_UI_BUTTON_CLASS, navi, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, navi, box = efl_add(EFL_UI_BOX_CLASS, navi,
@ -727,7 +727,7 @@ active_index_cb(void *data,
psp->spotlight = spotlight; psp->spotlight = spotlight;
psp->spinner = sp; 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); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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)); back_btn_cb, navi));
box = efl_add(EFL_UI_BOX_CLASS, 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_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Icon Type"), 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), indicator_icon_btn_cb, params),
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "None"), 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), indicator_none_btn_cb, params),
efl_pack_end(box, efl_added)); 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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"), efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added, 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_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout, efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"), efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added, 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)); efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params)); 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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"), efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added, 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_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout, efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"), efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added, 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)); efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params)); 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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Prev"), efl_text_set(efl_added, "Prev"),
efl_event_callback_add(efl_added, 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_content_set(efl_part(layout, "prev_btn"), efl_added));
efl_add(EFL_UI_BUTTON_CLASS, layout, efl_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Next"), efl_text_set(efl_added, "Next"),
efl_event_callback_add(efl_added, 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)); efl_content_set(efl_part(layout, "next_btn"), efl_added));
params = calloc(1, sizeof(Params)); params = calloc(1, sizeof(Params));

12
src/bin/elementary/test_ui_stack.c
View File

@ -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_text_set(left_btn, "Prev");
efl_content_set(efl_part(bn, "left_content"), left_btn); 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. //Positions of "left_content" and "back_button" are the same.
efl_gfx_entity_visible_set(efl_part(bn, "back_button"), EINA_FALSE); 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_text_set(right_btn, "Next");
efl_content_set(efl_part(bn, "right_content"), right_btn); 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 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); Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to remove top layout"); 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); 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); Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to pop"); 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); 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); Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to double push"); 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); 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); Eo *btn = efl_add(EFL_UI_BUTTON_CLASS, stack);
efl_text_set(btn, "Press to delete 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); Eo *nl = _navigation_layout_create(stack, "1st layout", btn);

38
src/bin/elementary/test_ui_tab_pager.c
View File

@ -222,7 +222,7 @@ _current_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
btn = efl_add(EFL_UI_BUTTON_CLASS, navi, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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, box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Current Tab Page Set"), 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_event_callback_add(efl_added, EFL_EVENT_DEL, _tab_set_btn_del_cb, tsd),
efl_pack_end(box, efl_added)); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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, box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 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 */ /* Pack Begin */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Begin"), 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)); efl_pack_end(box, efl_added));
/* Pack End */ /* Pack End */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack End"), 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)); efl_pack_end(box, efl_added));
/* Pack Before */ /* Pack Before */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack Before Current Tab Page"), 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)); efl_pack_end(box, efl_added));
/* Pack After */ /* Pack After */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Pack After Current Tab Page"), 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)); efl_pack_end(box, efl_added));
in_box = efl_add(EFL_UI_BOX_CLASS, box, 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 */ /* Pack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Pack At"), 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_event_callback_add(efl_added, EFL_EVENT_DEL, _pack_at_btn_del_cb, tsd),
efl_pack_end(in_box, efl_added)); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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, box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 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 */ /* Clear */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Clear"), 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_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
/* Unpack */ /* Unpack */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack"), 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)); efl_pack_end(box, efl_added));
/* Unpack All */ /* Unpack All */
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unpack All"), 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_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(box, efl_added)); efl_pack_end(box, efl_added));
@ -473,7 +473,7 @@ _unpack_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info)
/* Unpack At */ /* Unpack At */
btn = efl_add(EFL_UI_BUTTON_CLASS, in_box, btn = efl_add(EFL_UI_BUTTON_CLASS, in_box,
efl_text_set(efl_added, "Unpack At"), 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_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_ui_widget_disabled_set(efl_added, EINA_TRUE), //Soon to be implemented
efl_pack_end(in_box, efl_added)); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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, box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Change"), 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_event_callback_add(efl_added, EFL_EVENT_DEL, _change_btn_del_cb, tcd),
efl_pack_end(box, efl_added)); 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, btn = efl_add(EFL_UI_BUTTON_CLASS, navi,
efl_text_set(efl_added, "Back"), 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, box = efl_add(EFL_UI_BOX_CLASS, navi,
efl_gfx_arrangement_content_padding_set(efl_added, 10, 10, EINA_TRUE), 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, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Scroll"), 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)); efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Stack"), 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)); efl_pack_end(box, efl_added));
btn = efl_add(EFL_UI_BUTTON_CLASS, box, btn = efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unset"), 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)); efl_pack_end(box, efl_added));
} }

12
src/bin/elementary/test_ui_table.c
View File

@ -543,7 +543,7 @@ append_cb(void *data, const Efl_Event *ev EINA_UNUSED)
efl_text_set(o, btn_text("appended")); efl_text_set(o, btn_text("appended"));
efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 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"); elm_object_tooltip_text_set(o, "Click to unpack");
efl_pack(table, o); efl_pack(table, o);
efl_gfx_entity_visible_set(o, 1); 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); o = elm_button_add(win);
elm_object_content_set(o, ico); elm_object_content_set(o, ico);
elm_object_text_set(o, "Append"); 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_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1); 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); o = elm_button_add(win);
elm_object_content_set(o, ico); elm_object_content_set(o, ico);
elm_object_text_set(o, "Clear"); 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_pack(hbox, o);
efl_gfx_entity_visible_set(o, 1); 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_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 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_pack(table, o);
efl_gfx_entity_visible_set(o, 1); 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_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 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_pack(table, o);
efl_gfx_entity_visible_set(o, 1); 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_text_set(o, btn_text(NULL));
efl_gfx_hint_weight_set(o, 0, 0); efl_gfx_hint_weight_set(o, 0, 0);
efl_gfx_hint_fill_set(o, EINA_FALSE, EINA_FALSE); 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_pack(table, o);
efl_gfx_entity_visible_set(o, 1); efl_gfx_entity_visible_set(o, 1);

4
src/bin/elementary/test_ui_table_static.c
View File

@ -133,7 +133,7 @@ test_ui_table_static(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bt = elm_button_add(win); bt = elm_button_add(win);
elm_object_text_set(bt, "Next API function"); 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); efl_pack_table(table, bt, 30, 0, 40, 10);
elm_object_disabled_set(bt, api->state == API_STATE_LAST); elm_object_disabled_set(bt, api->state == API_STATE_LAST);
efl_gfx_entity_visible_set(bt, 1); 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); bt = elm_button_add(win);
elm_object_text_set(bt, "Change"); elm_object_text_set(bt, "Change");
efl_pack_table(table, bt, 40, 40, 20, 20); 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); efl_gfx_entity_visible_set(bt, 1);
rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win); rc = efl_add(EFL_CANVAS_RECTANGLE_CLASS, win);

2
src/bin/elementary/test_ui_tags.c
View File

@ -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_add(EFL_UI_BUTTON_CLASS, layout,
efl_text_set(efl_added, "Change mode"), 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)); elm_object_part_content_set(layout, "box", efl_added));
efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480)); efl_gfx_entity_size_set(win, EINA_SIZE2D(320, 480));

8
src/bin/elementary/test_win_indicator.c
View File

@ -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_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Indicator Off"), 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_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Opaque"), 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_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Bg Transparent"), 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_pack(bx, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, win, efl_add(EFL_UI_BUTTON_CLASS, win,
efl_text_set(efl_added, "Hidden"), 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)); efl_pack(bx, efl_added));
} }

4
src/examples/elementary/button_cxx_example_00.cc
View File

@ -29,7 +29,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto cb(std::bind([wbt]() { auto cb(std::bind([wbt]() {
std::cout << wbt->text_get() << std::endl; 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); efl::ui::Button bt2(instantiate, win);
bt2.text_set("Click to quit"); 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]() { auto cb2(std::bind([wwin]() {
::efl_del(wwin->_eo_ptr()); // FIXME: No proper C++ API to delete win ::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}); win.size_set({320,160});
} }

20
src/examples/elementary/button_cxx_example_01.cc
View File

@ -67,17 +67,17 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
wright->autorepeat_gap_timeout_set(t); wright->autorepeat_gap_timeout_set(t);
} }
}, std::placeholders::_1); }, 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); efl::ui::Button btn2(instantiate, win);
btn2.text_set("Initial: 1.0"); btn2.text_set("Initial: 1.0");
box_initial.pack_end(btn2); 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); efl::ui::Button btn3(instantiate, win);
btn3.text_set("Initial: 5.0"); btn3.text_set("Initial: 5.0");
box_initial.pack_end(btn3); 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); efl::ui::Box box_gap(instantiate, win);
box_gap.orientation_set(EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL); 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); efl::ui::Button btn4(instantiate, win);
btn4.text_set("Gap: 0.1"); btn4.text_set("Gap: 0.1");
box_gap.pack_end(btn4); 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); efl::ui::Button btn5(instantiate, win);
btn5.text_set("Gap: 0.5"); btn5.text_set("Gap: 0.5");
box_gap.pack_end(btn5); 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); efl::ui::Button btn6(instantiate, win);
btn6.text_set("Gap: 1.0"); btn6.text_set("Gap: 1.0");
box_gap.pack_end(btn6); 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_enabled_set(true);
up.autorepeat_initial_timeout_set(1.0); 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; 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); efl::ui::Image icon_up(instantiate, win);
icon_up.icon_set("arrow_up"); 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); left.hint_align_set(0.0, 0.5);
box_inferior.pack_end(left); box_inferior.pack_end(left);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, left, btn_cursors_move); 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); efl::ui::Image icon_left(instantiate, win);
icon_left.icon_set("arrow_left"); 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); right.hint_align_set(0.0, 0.5);
box_inferior.pack_end(right); box_inferior.pack_end(right);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, right, btn_cursors_move); 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); efl::ui::Image icon_right(instantiate, win);
icon_right.icon_set("arrow_right"); 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); down.hint_align_set(0.5, 0.0);
box.pack_end(down); box.pack_end(down);
efl::eolian::event_add(efl::ui::Autorepeat::repeated_event, down, btn_cursors_move); 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); efl::ui::Image icon_down(instantiate, win);
icon_down.icon_set("arrow_down"); icon_down.icon_set("arrow_down");

10
src/examples/elementary/efl_ui_list_example_1.c
View File

@ -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_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_ITEM_UNSELECTED, _list_unselected, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_PRESSED, _list_pressed, NULL); efl_event_callback_add(list, EFL_INPUT_EVENT_PRESSED, _list_pressed, NULL);
efl_event_callback_add(list, EFL_UI_EVENT_UNPRESSED, _list_unpressed, NULL); efl_event_callback_add(list, EFL_INPUT_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_LONGPRESSED, _list_longpressed, NULL);
for (i = 0; i < NUM_ITEMS; i++) 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_text_set(scrl_btn, "Scroll Item");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); 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); efl_pack_end(rbox, scrl_btn);
scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox); scrl_btn = efl_add(EFL_UI_BUTTON_CLASS, rbox);
efl_text_set(scrl_btn, "Scroll Item Align"); efl_text_set(scrl_btn, "Scroll Item Align");
efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5); efl_gfx_hint_align_set(scrl_btn, 0.5, 0.5);
efl_gfx_hint_size_min_set(scrl_btn, EINA_SIZE2D(200, 25)); 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(rbox, scrl_btn);
efl_pack_end(bbox, rbox); efl_pack_end(bbox, rbox);

2
src/examples/elementary/efl_ui_slideshow_example.c
View File

@ -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_gfx_hint_weight_set(efl_added, 1.0, 0.0),
efl_pack_table(table, efl_added, 0, 1, 1, 1), efl_pack_table(table, efl_added, 0, 1, 1, 1),
efl_text_set(efl_added, "Play"), 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)); efl_gfx_entity_size_set(win, EINA_SIZE2D(200, 200));
} }

2
src/examples/elementary/efl_ui_theme_example_01.c
View File

@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload extension"), 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_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,

2
src/examples/elementary/efl_ui_theme_example_02.c
View File

@ -62,7 +62,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,
efl_text_set(efl_added, "Unload overlay"), 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_pack_end(box, efl_added));
efl_add(EFL_UI_BUTTON_CLASS, box, efl_add(EFL_UI_BUTTON_CLASS, box,

26
src/examples/elementary/popup_cxx_example.cc
View File

@ -84,7 +84,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
auto repeat_events_test_cb(std::bind([]() { auto repeat_events_test_cb(std::bind([]() {
std::cout << "Repeat Test Button is clicked" << std::endl; 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; 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 //Delete Button
@ -128,7 +128,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
else else
std::cout << "Efl.Ui.Popup does not exist" << std::endl; 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 //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"); 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 //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"); 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 //Backwall Button
@ -215,7 +215,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
backwall_btn.text_set("Set Backwall"); 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 //Timeout Button
@ -230,7 +230,7 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.timeout_set(3); g_popup.timeout_set(3);
std::cout << "Timeout is set to 3 seconds" << std::endl; 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 //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); g_popup.align_set(EFL_UI_POPUP_ALIGN_CENTER);
std::cout << "Align Center" << std::endl; 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 //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); g_popup.align_set(EFL_UI_POPUP_ALIGN_TOP);
std::cout << "Align Top" << std::endl; 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 //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); g_popup.align_set(EFL_UI_POPUP_ALIGN_LEFT);
std::cout << "Align Left" << std::endl; 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 //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); g_popup.align_set(EFL_UI_POPUP_ALIGN_RIGHT);
std::cout << "Align Right" << std::endl; 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 //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); g_popup.align_set(EFL_UI_POPUP_ALIGN_BOTTOM);
std::cout << "Align Bottom" << std::endl; 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 //Position Button
@ -320,6 +320,6 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
g_popup.position_set({0, 0}); g_popup.position_set({0, 0});
std::cout << "Position is set to (0, 0)" << std::endl; 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() EFL_MAIN()

1
src/lib/elementary/Efl_Ui.h
View File

@ -246,7 +246,6 @@ typedef Eo Efl_Ui_Spotlight_Indicator;
# include <efl_ui_navigation_bar_part.eo.h> # include <efl_ui_navigation_bar_part.eo.h>
# include <efl_ui_navigation_bar_part_back_button.eo.h> # include <efl_ui_navigation_bar_part_back_button.eo.h>
# include <efl_ui_navigation_layout.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_clickable_util.eo.h>
# include <efl_ui_format.eo.h> # include <efl_ui_format.eo.h>
# include <efl_ui_spin.eo.h> # include <efl_ui_spin.eo.h>

1
src/lib/elementary/Elementary.h
View File

@ -169,7 +169,6 @@ typedef Eo Efl_Ui_Focus_Manager;
#ifdef EFL_BETA_API_SUPPORT #ifdef EFL_BETA_API_SUPPORT
# include <elm_interface_scrollable.h> # include <elm_interface_scrollable.h>
# include <elm_interface_scrollable.eo.h> # include <elm_interface_scrollable.eo.h>
#include <efl_ui_clickable.eo.h>
#endif #endif
#include <elm_tooltip.h> #include <elm_tooltip.h>

6
src/lib/elementary/efl_ui_alert_popup.c
View File

@ -154,15 +154,15 @@ _efl_ui_alert_popup_button_set(Eo *obj, Efl_Ui_Alert_Popup_Data *pd, Efl_Ui_Aler
switch (type) switch (type)
{ {
case EFL_UI_ALERT_POPUP_BUTTON_POSITIVE: 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); _positive_button_clicked_cb, obj);
break; break;
case EFL_UI_ALERT_POPUP_BUTTON_NEGATIVE: 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); _negative_button_clicked_cb, obj);
break; break;
case EFL_UI_ALERT_POPUP_BUTTON_USER: 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); _user_button_clicked_cb, obj);
break; break;
default: default:

10
src/lib/elementary/efl_ui_button.c
View File

@ -6,7 +6,7 @@
#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_OBJECT_PROTECTED
#define ELM_LAYOUT_PROTECTED #define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED #define EFL_PART_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.h" #include "elm_priv.h"
@ -77,8 +77,8 @@ _activate(Evas_Object *obj)
evas_object_smart_callback_call(obj, "clicked", NULL); evas_object_smart_callback_call(obj, "clicked", NULL);
else else
{ {
efl_ui_clickable_press(obj, 1); efl_input_clickable_press(obj, 1);
efl_ui_clickable_unpress(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); evas_object_smart_callback_call(obj, "clicked", NULL);
else else
{ {
efl_ui_clickable_press(obj, 1); efl_input_clickable_press(obj, 1);
efl_ui_clickable_unpress(obj, 1); efl_input_clickable_unpress(obj, 1);
} }
if (elm_widget_is_legacy(obj)) if (elm_widget_is_legacy(obj))

2
src/lib/elementary/efl_ui_button.eo
View File

@ -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.Text, Efl.Content,
Efl.Access.Widget.Action Efl.Access.Widget.Action
{ {

2
src/lib/elementary/efl_ui_calendar.c
View File

@ -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_enabled_set(efl_added, EINA_TRUE),
efl_ui_autorepeat_initial_timeout_set(efl_added, FIRST_INTERVAL), efl_ui_autorepeat_initial_timeout_set(efl_added, FIRST_INTERVAL),
efl_ui_autorepeat_gap_timeout_set(efl_added, 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), _inc_dec_btn_clicked_cb, obj),
efl_event_callback_add(efl_added, EFL_UI_AUTOREPEAT_EVENT_REPEATED, efl_event_callback_add(efl_added, EFL_UI_AUTOREPEAT_EVENT_REPEATED,
_inc_dec_btn_repeated_cb, obj), _inc_dec_btn_repeated_cb, obj),

24
src/lib/elementary/efl_ui_clickable_util.c
View File

@ -2,7 +2,7 @@
# include <config.h> # include <config.h>
#endif #endif
#define EFL_UI_CLICKABLE_PROTECTED 1 #define EFL_INPUT_CLICKABLE_PROTECTED 1
#include <Efl_Ui.h> #include <Efl_Ui.h>
#include "elm_priv.h" #include "elm_priv.h"
@ -17,7 +17,7 @@ _on_press_cb(void *data,
const char *emission EINA_UNUSED, const char *emission EINA_UNUSED,
const char *source EINA_UNUSED) const char *source EINA_UNUSED)
{ {
efl_ui_clickable_press(data, 1); efl_input_clickable_press(data, 1);
} }
static void static void
@ -26,7 +26,7 @@ _on_unpress_cb(void *data,
const char *emission EINA_UNUSED, const char *emission EINA_UNUSED,
const char *source EINA_UNUSED) const char *source EINA_UNUSED)
{ {
efl_ui_clickable_unpress(data, 1); efl_input_clickable_unpress(data, 1);
} }
static void static void
@ -35,7 +35,7 @@ _on_mouse_out(void *data,
const char *emission EINA_UNUSED, const char *emission EINA_UNUSED,
const char *source 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 static void
@ -44,7 +44,7 @@ _theme_move_cb(void *data, const Efl_Event *ev EINA_UNUSED)
Efl_Input_Pointer *pointer = ev->info; Efl_Input_Pointer *pointer = ev->info;
if (efl_input_processed_get(pointer)) 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, EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
@ -52,7 +52,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_theme_callbacks,
) )
EOLIAN static void 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); 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; Efl_Input_Pointer *pointer = ev->info;
if (!efl_input_processed_get(pointer)) 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); 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); Eina_Rect geom = efl_gfx_entity_geometry_get(data);
if (efl_input_processed_get(pointer)) 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)) 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 //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) 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); efl_input_processed_set(pointer, EINA_TRUE);
} }
} }
else else
{ {
efl_ui_clickable_unpress(data, 1); efl_input_clickable_unpress(data, 1);
efl_input_processed_set(pointer, EINA_TRUE); efl_input_processed_set(pointer, EINA_TRUE);
} }
} }
@ -105,7 +105,7 @@ EFL_CALLBACKS_ARRAY_DEFINE(bind_to_object_callbacks,
) )
EOLIAN static void 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); efl_event_callback_array_add(object, bind_to_object_callbacks(), clickable);
} }

12
src/lib/elementary/efl_ui_clickable_util.eo
View File

@ -1,12 +1,12 @@
class @beta Efl.Ui.Clickable_Util { 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 { methods {
bind_to_theme @class { bind_to_theme @class {
[[This will listen to the standard "click" events on a theme and emit the appropriate [[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 Using these methods widgets do not need to listen to the theme signals. This class
does it and calls the correct clickable functions. does it and calls the correct clickable functions.
@ -16,12 +16,12 @@ class @beta Efl.Ui.Clickable_Util {
]] ]]
params { params {
object : Efl.Canvas.Layout; [[The object to listen on.]] 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 { bind_to_object @class {
[[This will listen to the standard "click" events on an object, and emit the appropriate [[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 Using these methods widgets do not need to listen to the object events. This class
does it and calls the correct clickable functions. does it and calls the correct clickable functions.
@ -30,7 +30,7 @@ class @beta Efl.Ui.Clickable_Util {
]] ]]
params { params {
object : Efl.Input.Interface; [[The object to listen on.]] 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.]]
} }
} }
} }

20
src/lib/elementary/efl_ui_collection.c
View File

@ -517,11 +517,11 @@ _redirect_cb(void *data, const Efl_Event *ev)
#define REDIRECT_EVT(item_evt, item) \ #define REDIRECT_EVT(item_evt, item) \
if (item_evt == ev->desc) efl_event_callback_call(obj, item, ev->object); 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_INPUT_EVENT_PRESSED, EFL_UI_EVENT_ITEM_PRESSED);
REDIRECT_EVT(EFL_UI_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED); REDIRECT_EVT(EFL_INPUT_EVENT_UNPRESSED, EFL_UI_EVENT_ITEM_UNPRESSED);
REDIRECT_EVT(EFL_UI_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED); REDIRECT_EVT(EFL_INPUT_EVENT_LONGPRESSED, EFL_UI_EVENT_ITEM_LONGPRESSED);
REDIRECT_EVT(EFL_UI_EVENT_CLICKED_ANY, EFL_UI_EVENT_ITEM_CLICKED_ANY); REDIRECT_EVT(EFL_INPUT_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_CLICKED, EFL_UI_EVENT_ITEM_CLICKED);
#undef REDIRECT_EVT #undef REDIRECT_EVT
} }
@ -529,11 +529,11 @@ EFL_CALLBACKS_ARRAY_DEFINE(active_item,
{EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb}, {EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _hints_changed_cb},
{EFL_UI_EVENT_ITEM_SELECTED, _selected_cb}, {EFL_UI_EVENT_ITEM_SELECTED, _selected_cb},
{EFL_UI_EVENT_ITEM_UNSELECTED, _unselected_cb}, {EFL_UI_EVENT_ITEM_UNSELECTED, _unselected_cb},
{EFL_UI_EVENT_PRESSED, _redirect_cb}, {EFL_INPUT_EVENT_PRESSED, _redirect_cb},
{EFL_UI_EVENT_UNPRESSED, _redirect_cb}, {EFL_INPUT_EVENT_UNPRESSED, _redirect_cb},
{EFL_UI_EVENT_LONGPRESSED, _redirect_cb}, {EFL_INPUT_EVENT_LONGPRESSED, _redirect_cb},
{EFL_UI_EVENT_CLICKED, _redirect_cb}, {EFL_INPUT_EVENT_CLICKED, _redirect_cb},
{EFL_UI_EVENT_CLICKED_ANY, _redirect_cb}, {EFL_INPUT_EVENT_CLICKED_ANY, _redirect_cb},
{EFL_EVENT_INVALIDATE, _invalidate_cb}, {EFL_EVENT_INVALIDATE, _invalidate_cb},
) )

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

@ -5,7 +5,7 @@
#define EFL_ACCESS_OBJECT_PROTECTED #define EFL_ACCESS_OBJECT_PROTECTED
#define ELM_LAYOUT_PROTECTED #define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED #define EFL_PART_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>
#include "elm_priv.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", (wd->resize_obj, "efl,anim,done", "efl",
_on_recalc_done, obj); _on_recalc_done, obj);
efl_ui_clickable_util_bind_to_theme(wd->resize_obj, 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); elm_widget_can_focus_set(obj, EINA_FALSE);

2
src/lib/elementary/efl_ui_frame.eo
View File

@ -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 Efl.Content
{ {
[[Frame widget [[Frame widget

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

@ -7,7 +7,7 @@
#define EFL_ACCESS_COMPONENT_PROTECTED #define EFL_ACCESS_COMPONENT_PROTECTED
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define EFL_LAYOUT_CALC_PROTECTED #define EFL_LAYOUT_CALC_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>
@ -747,7 +747,7 @@ _key_action_activate(Evas_Object *obj, const char *params EINA_UNUSED)
if (elm_widget_is_legacy(obj)) if (elm_widget_is_legacy(obj))
evas_object_smart_callback_call(obj, "clicked", NULL); evas_object_smart_callback_call(obj, "clicked", NULL);
else else
efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, NULL); efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, NULL);
return EINA_TRUE; return EINA_TRUE;
} }

2
src/lib/elementary/efl_ui_image.eo
View File

@ -16,7 +16,7 @@ struct @beta Efl.Ui.Image_Error
open_error: bool; [[$true if the error happened when opening the file, $false otherwise]] 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.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.Access.Component, Efl.Access.Widget.Action, Efl.Gfx.Color,
Efl.Gfx.Image_Orientable, Efl.Gfx.Image_Orientable,

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

@ -6,7 +6,7 @@
#define EFL_ACCESS_WIDGET_ACTION_PROTECTED #define EFL_ACCESS_WIDGET_ACTION_PROTECTED
#define EFL_UI_SCROLL_MANAGER_PROTECTED #define EFL_UI_SCROLL_MANAGER_PROTECTED
#define EFL_UI_SCROLLBAR_PROTECTED #define EFL_UI_SCROLLBAR_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>

8
src/lib/elementary/efl_ui_item.c
View File

@ -175,7 +175,7 @@ _item_longpressed(void *data)
pd->longpress_timer = NULL; 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; return ECORE_CALLBACK_CANCEL;
} }
@ -195,7 +195,7 @@ _item_mouse_down(void *data,
edje_object_signal_emit(wd->resize_obj, "efl,state,pressed", "efl"); edje_object_signal_emit(wd->resize_obj, "efl,state,pressed", "efl");
pd->longpress_timer = ecore_timer_add(_elm_config->longpress_timeout, _item_longpressed, item); 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 static void
@ -217,7 +217,7 @@ _item_mouse_up(void *data,
{ {
//FIXME: should we send this message to fallback? //FIXME: should we send this message to fallback?
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl"); 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; return;
} }
@ -228,7 +228,7 @@ _item_mouse_up(void *data,
} }
edje_object_signal_emit(wd->resize_obj, "efl,state,unpressed", "efl"); 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)); m = efl_ui_select_mode_get(efl_ui_item_container_get(item));
if ((m != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected)) if ((m != EFL_UI_SELECT_MODE_SINGLE_ALWAYS) && (pd->selected))

2
src/lib/elementary/efl_ui_item.eo
View File

@ -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.]] [[Item abstract class for pack widget. All item have to be inherited from this class.]]
methods { methods {

6
src/lib/elementary/efl_ui_navigation_bar.c
View File

@ -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, Eo *back_button = efl_add(EFL_UI_BUTTON_CLASS, obj,
elm_widget_element_update(obj, efl_added, "back_button"), 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)); efl_gfx_entity_visible_set(efl_added, EINA_FALSE));
pd->back_button = back_button; 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; 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; ppd->back_button = content;
return _efl_ui_navigation_bar_content_set(pd->obj, ppd, pd->part, 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); 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_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; ppd->back_button = NULL;
return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part); return _efl_ui_navigation_bar_content_unset(pd->obj, ppd, pd->part);

6
src/lib/elementary/efl_ui_panes.c
View File

@ -6,7 +6,7 @@
#define ELM_LAYOUT_PROTECTED #define ELM_LAYOUT_PROTECTED
#define EFL_GFX_HINT_PROTECTED #define EFL_GFX_HINT_PROTECTED
#define EFL_PART_PROTECTED #define EFL_PART_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>
@ -184,7 +184,7 @@ _on_pressed(void *data,
const char *source EINA_UNUSED) const char *source EINA_UNUSED)
{ {
efl_event_callback_legacy_call(data, ELM_PANES_EVENT_PRESS, NULL); 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 static void
@ -195,7 +195,7 @@ _on_unpressed(void *data,
{ {
EFL_UI_PANES_DATA_GET(data, sd); EFL_UI_PANES_DATA_GET(data, sd);
efl_event_callback_legacy_call(data, ELM_PANES_EVENT_UNPRESS, NULL); 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) if (sd->double_clicked)
{ {
evas_object_smart_callback_call(data, "clicked,double", NULL); evas_object_smart_callback_call(data, "clicked,double", NULL);

2
src/lib/elementary/efl_ui_panes.eo
View File

@ -1,5 +1,5 @@
class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable, class @beta Efl.Ui.Panes extends Efl.Ui.Layout_Base implements Efl.Ui.Layout_Orientable,
Efl.Ui.Clickable Efl.Input.Clickable
{ {
[[Elementary panes class]] [[Elementary panes class]]
event_prefix: elm_panes; event_prefix: elm_panes;

2
src/lib/elementary/efl_ui_spin_button.c
View File

@ -41,7 +41,7 @@ static void
_access_increment_decrement_info_say(Evas_Object *obj, Eina_Bool is_incremented); _access_increment_decrement_info_say(Evas_Object *obj, Eina_Bool is_incremented);
EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb, 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}, { EFL_UI_AUTOREPEAT_EVENT_REPEATED, _inc_dec_button_clicked_cb},
); );

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

@ -28,7 +28,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_tags_cb, EFL_CALLBACKS_ARRAY_DEFINE(_tags_cb,
{ ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
{ EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_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 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); 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 static void

6
src/lib/elementary/efl_ui_text.c
View File

@ -7,7 +7,7 @@
#define EFL_ACCESS_EDITABLE_TEXT_PROTECTED #define EFL_ACCESS_EDITABLE_TEXT_PROTECTED
#define ELM_LAYOUT_PROTECTED #define ELM_LAYOUT_PROTECTED
#define EFL_PART_PROTECTED #define EFL_PART_PROTECTED
#define EFL_UI_CLICKABLE_PROTECTED #define EFL_INPUT_CLICKABLE_PROTECTED
#include <Elementary.h> #include <Elementary.h>
#include <Elementary_Cursor.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)) if (!elm_widget_theme_klass_get(obj))
elm_widget_theme_klass_set(obj, "text"); elm_widget_theme_klass_set(obj, "text");
obj = efl_constructor(efl_super(obj, MY_CLASS)); 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); 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); 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) && if (!elm_widget_disabled_get(obj) &&
!evas_object_freeze_events_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) if (sd->editable && sd->input_panel_enable)
edje_object_part_text_input_panel_show(sd->entry_edje, "efl.text"); edje_object_part_text_input_panel_show(sd->entry_edje, "efl.text");
} }

2
src/lib/elementary/efl_ui_text.eo
View File

@ -1,7 +1,7 @@
/* FIXME - Text object must stop using elm_general! */ /* FIXME - Text object must stop using elm_general! */
import 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.Access.Text, Efl.Access.Editable.Text, Efl.File,
Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup Efl.Ui.Selectable, Efl.Text_Interactive, Efl.Text_Markup
{ {

2
src/lib/elementary/efl_ui_timepicker.c
View File

@ -136,7 +136,7 @@ _fields_init(Eo *obj)
efl_event_callback_add(efl_added, EFL_UI_SPIN_EVENT_CHANGED,_field_changed_cb, 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, 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")); elm_widget_element_update(obj, efl_added, "button"));
pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj); pd->dt_manager = efl_add(EFL_DATETIME_MANAGER_CLASS, obj);

2
src/lib/elementary/elc_multibuttonentry.c
View File

@ -67,7 +67,7 @@ static void _entry_clicked_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb, EFL_CALLBACKS_ARRAY_DEFINE(_multi_buttonentry_cb,
{ ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb }, { ELM_ENTRY_EVENT_CHANGED, _entry_changed_cb },
{ EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED , _entry_focus_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 EOLIAN static void

2
src/lib/elementary/elc_naviframe.c
View File

@ -1499,7 +1499,7 @@ _key_action_top_item_get(Evas_Object *obj, const char *params EINA_UNUSED)
///Leave for compatibility. ///Leave for compatibility.
ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it); ELM_NAVIFRAME_ITEM_DATA_GET(eo_item, it);
if (it->title_prev_btn) 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; return EINA_TRUE;
} }

2
src/lib/elementary/elm_bubble_eo.c
View File

@ -50,6 +50,6 @@ static const Efl_Class_Description _elm_bubble_class_desc = {
NULL 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" #include "elm_bubble_eo.legacy.c"

6
src/lib/elementary/elm_calendar.c
View File

@ -74,9 +74,9 @@ static void
_inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED); _inc_dec_button_unpressed_cb(void *data, const Efl_Event *event EINA_UNUSED);
EFL_CALLBACKS_ARRAY_DEFINE( _inc_dec_button_cb, 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_EVENT_PRESSED, _inc_dec_button_pressed_cb}, { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
{ EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb} { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}
); );
static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params); static Eina_Bool _key_action_activate(Evas_Object *obj, const char *params);

2
src/lib/elementary/elm_color_class.c
View File

@ -750,7 +750,7 @@ elm_color_class_editor_add(Evas_Object *obj)
elm_object_text_set(bt, "Reset"); elm_object_text_set(bt, "Reset");
elm_object_part_content_set(ly, "elm.swallow.reset", bt); elm_object_part_content_set(ly, "elm.swallow.reset", bt);
efl_event_callback_add 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); cc->cs = cs = elm_colorselector_add(ly);
elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS); elm_colorselector_mode_set(cs, ELM_COLORSELECTOR_COMPONENTS);

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

@ -1287,7 +1287,7 @@ _color_bars_add(Evas_Object *obj)
edje_object_part_swallow edje_object_part_swallow
(sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt); (sd->cb_data[i]->colorbar, "elm.l_button", sd->cb_data[i]->lbt);
efl_event_callback_add 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_set(sd->cb_data[i]->lbt, EINA_TRUE);
elm_button_autorepeat_initial_timeout_set elm_button_autorepeat_initial_timeout_set
(sd->cb_data[i]->lbt, _elm_config->longpress_timeout); (sd->cb_data[i]->lbt, _elm_config->longpress_timeout);
@ -1305,7 +1305,7 @@ _color_bars_add(Evas_Object *obj)
edje_object_part_swallow edje_object_part_swallow
(sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt); (sd->cb_data[i]->colorbar, "elm.r_button", sd->cb_data[i]->rbt);
efl_event_callback_add 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_set(sd->cb_data[i]->rbt, EINA_TRUE);
elm_button_autorepeat_initial_timeout_set elm_button_autorepeat_initial_timeout_set
(sd->cb_data[i]->rbt, _elm_config->longpress_timeout); (sd->cb_data[i]->rbt, _elm_config->longpress_timeout);

2
src/lib/elementary/elm_colorselector_eo.c
View File

@ -146,6 +146,6 @@ static const Efl_Class_Description _elm_colorselector_class_desc = {
NULL 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" #include "elm_colorselector_eo.legacy.c"

2
src/lib/elementary/elm_diskselector_eo.c
View File

@ -222,6 +222,6 @@ static const Efl_Class_Description _elm_diskselector_class_desc = {
NULL 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" #include "elm_diskselector_eo.legacy.c"

2
src/lib/elementary/elm_entry.c
View File

@ -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_legacy_call(obj, ELM_ENTRY_EVENT_ANCHOR_HOVER_OPENED, &ei);
efl_event_callback_add 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 /* FIXME: Should just check if there's any callback registered to
* the smart events instead. This is used to determine if anyone * the smart events instead. This is used to determine if anyone

2
src/lib/elementary/elm_entry_eo.c
View File

@ -1188,6 +1188,6 @@ static const Efl_Class_Description _elm_entry_class_desc = {
NULL 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" #include "elm_entry_eo.legacy.c"

2
src/lib/elementary/elm_fileselector_entry_eo.c
View File

@ -88,4 +88,4 @@ static const Efl_Class_Description _elm_fileselector_entry_class_desc = {
NULL 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);

2
src/lib/elementary/elm_fileselector_eo.c
View File

@ -202,6 +202,6 @@ static const Efl_Class_Description _elm_fileselector_class_desc = {
_elm_fileselector_class_destructor _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" #include "elm_fileselector_eo.legacy.c"

2
src/lib/elementary/elm_gengrid_eo.c
View File

@ -512,6 +512,6 @@ static const Efl_Class_Description _elm_gengrid_class_desc = {
NULL 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" #include "elm_gengrid_eo.legacy.c"

2
src/lib/elementary/elm_genlist_eo.c
View File

@ -681,6 +681,6 @@ static const Efl_Class_Description _elm_genlist_class_desc = {
NULL 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" #include "elm_genlist_eo.legacy.c"

2
src/lib/elementary/elm_hover_eo.c
View File

@ -92,6 +92,6 @@ static const Efl_Class_Description _elm_hover_class_desc = {
NULL 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" #include "elm_hover_eo.legacy.c"

2
src/lib/elementary/elm_hoversel_eo.c
View File

@ -189,6 +189,6 @@ static const Efl_Class_Description _elm_hoversel_class_desc = {
NULL 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" #include "elm_hoversel_eo.legacy.c"

2
src/lib/elementary/elm_index_eo.c
View File

@ -322,6 +322,6 @@ static const Efl_Class_Description _elm_index_class_desc = {
NULL 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" #include "elm_index_eo.legacy.c"

2
src/lib/elementary/elm_list_eo.c
View File

@ -363,6 +363,6 @@ static const Efl_Class_Description _elm_list_class_desc = {
NULL 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" #include "elm_list_eo.legacy.c"

2
src/lib/elementary/elm_map_eo.c
View File

@ -360,6 +360,6 @@ static const Efl_Class_Description _elm_map_class_desc = {
NULL 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" #include "elm_map_eo.legacy.c"

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

@ -780,13 +780,13 @@ _elm_menu_menu_bar_set(Eo *obj, Eina_Bool menu_bar)
if (menu_bar) if (menu_bar)
{ {
efl_event_callback_add 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)); snprintf(style, sizeof(style), "main_menu_submenu//%s", elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style); elm_object_style_set(item->submenu.hv, style);
} }
else 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)); snprintf(style, sizeof(style), "submenu/%s", elm_widget_style_get(obj));
elm_object_style_set(item->submenu.hv, style); elm_object_style_set(item->submenu.hv, style);
} }

2
src/lib/elementary/elm_menu_eo.c
View File

@ -119,6 +119,6 @@ static const Efl_Class_Description _elm_menu_class_desc = {
NULL 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" #include "elm_menu_eo.legacy.c"

2
src/lib/elementary/elm_multibuttonentry_eo.c
View File

@ -219,6 +219,6 @@ static const Efl_Class_Description _elm_multibuttonentry_class_desc = {
NULL 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" #include "elm_multibuttonentry_eo.legacy.c"

2
src/lib/elementary/elm_photo_eo.c
View File

@ -76,4 +76,4 @@ static const Efl_Class_Description _elm_photo_class_desc = {
NULL 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);

2
src/lib/elementary/elm_plug_eo.c
View File

@ -54,6 +54,6 @@ static const Efl_Class_Description _elm_plug_class_desc = {
NULL 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" #include "elm_plug_eo.legacy.c"

8
src/lib/elementary/elm_spinner.c
View File

@ -60,9 +60,9 @@ static void
_entry_activated_cb(void *data, const Efl_Event *event); _entry_activated_cb(void *data, const Efl_Event *event);
EFL_CALLBACKS_ARRAY_DEFINE(_inc_dec_button_cb, 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_EVENT_PRESSED, _inc_dec_button_pressed_cb}, { EFL_INPUT_EVENT_PRESSED, _inc_dec_button_pressed_cb},
{ EFL_UI_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb}, { EFL_INPUT_EVENT_UNPRESSED, _inc_dec_button_unpressed_cb},
{ EFL_EVENT_POINTER_MOVE, _inc_dec_button_mouse_move_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); elm_widget_can_focus_set(priv->text_button, _elm_config->access_mode);
efl_event_callback_add 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 efl_event_callback_add
(priv->text_button, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_change, obj); (priv->text_button, EFL_UI_FOCUS_OBJECT_EVENT_FOCUS_CHANGED, _text_button_focus_change, obj);

2
src/lib/elementary/elm_thumb_eo.c
View File

@ -82,4 +82,4 @@ static const Efl_Class_Description _elm_thumb_class_desc = {
NULL 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);

2
src/lib/elementary/elm_toolbar_eo.c
View File

@ -372,6 +372,6 @@ static const Efl_Class_Description _elm_toolbar_class_desc = {
NULL 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" #include "elm_toolbar_eo.legacy.c"

2
src/lib/elementary/meson.build
View File

@ -176,7 +176,6 @@ pub_eo_files = [
'efl_ui_caching_factory.eo', 'efl_ui_caching_factory.eo',
'efl_ui_widget_factory.eo', 'efl_ui_widget_factory.eo',
'efl_ui_relative_layout.eo', 'efl_ui_relative_layout.eo',
'efl_ui_clickable.eo',
'efl_ui_clickable_util.eo', 'efl_ui_clickable_util.eo',
'efl_ui_format.eo', 'efl_ui_format.eo',
'efl_ui_collection.eo', 'efl_ui_collection.eo',
@ -930,7 +929,6 @@ elementary_src = [
'efl_ui_exact_model.c', 'efl_ui_exact_model.c',
'efl_ui_average_model.c', 'efl_ui_average_model.c',
'efl_ui_relative_layout.c', 'efl_ui_relative_layout.c',
'efl_ui_clickable.c',
'efl_ui_clickable_util.c', 'efl_ui_clickable_util.c',
'efl_ui_format.c', 'efl_ui_format.c',
'efl_ui_scroll_util.c', 'efl_ui_scroll_util.c',

1
src/lib/evas/Evas_Eo.h
View File

@ -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_hold.eo.h"
#include "canvas/efl_input_interface.eo.h" #include "canvas/efl_input_interface.eo.h"
#include "canvas/efl_input_focus.eo.h" #include "canvas/efl_input_focus.eo.h"
#include "canvas/efl_input_clickable.eo.h"

33
src/lib/elementary/efl_ui_clickable.c → src/lib/evas/canvas/efl_input_clickable.c
View File

@ -2,10 +2,11 @@
# include <config.h> # include <config.h>
#endif #endif
#define EFL_UI_CLICKABLE_PROTECTED 1 #define EFL_INPUT_CLICKABLE_PROTECTED 1
#include <Efl_Ui.h> #include <Evas.h>
#include "elm_priv.h" #include <Ecore.h>
#include "evas_common_private.h"
typedef struct { typedef struct {
Eina_Bool pressed; Eina_Bool pressed;
@ -16,9 +17,9 @@ typedef struct {
typedef struct { typedef struct {
Button_State state[3]; 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 DOUBLE_CLICK_TIME ((double)0.1) //in seconds
#define LONGPRESS_TIMEOUT ((double)1.0) //in seconds #define LONGPRESS_TIMEOUT ((double)1.0) //in seconds
@ -27,7 +28,7 @@ static void
_timer_longpress(void *data, const Efl_Event *ev) _timer_longpress(void *data, const Efl_Event *ev)
{ {
Button_State *state; 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) for (int i = 0; i < 3; ++i)
{ {
@ -36,13 +37,13 @@ _timer_longpress(void *data, const Efl_Event *ev)
{ {
efl_del(state->timer); efl_del(state->timer);
state->timer = NULL; 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 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; Button_State *state;
EINA_SAFETY_ON_FALSE_RETURN(button < 3); 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_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_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 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; Button_State *state;
Eina_Bool pressed; Eina_Bool pressed;
EINA_SAFETY_ON_FALSE_RETURN(button < 3); 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; state->timer = NULL;
//populate state //populate state
efl_event_callback_call(obj, EFL_UI_EVENT_UNPRESSED, &button); efl_event_callback_call(obj, EFL_INPUT_EVENT_UNPRESSED, &button);
if (pressed) if (pressed)
{ {
INF("Widget %s,%p is clicked(%d)", efl_class_name_get(obj), obj, button); INF("Widget %s,%p is clicked(%d)", efl_class_name_get(obj), obj, button);
clicked.repeated = state->pressed_before; clicked.repeated = state->pressed_before;
clicked.button = button; clicked.button = button;
if (button == 1) if (button == 1)
efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED, &clicked); efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED, &clicked);
efl_event_callback_call(obj, EFL_UI_EVENT_CLICKED_ANY, &clicked); efl_event_callback_call(obj, EFL_INPUT_EVENT_CLICKED_ANY, &clicked);
} }
} }
EOLIAN static void 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; Button_State *state;
EINA_SAFETY_ON_FALSE_RETURN(button < 3); 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; state->pressed = EINA_FALSE;
} }
#include "efl_ui_clickable.eo.c" #include "efl_input_clickable.eo.c"

12
src/lib/elementary/efl_ui_clickable.eo → src/lib/evas/canvas/efl_input_clickable.eo
View File

@ -1,13 +1,13 @@
struct @beta Efl.Ui.Clickable_Clicked { struct @beta Efl.Input.Clickable_Clicked {
[[A struct that expresses a click in elementary.]] [[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]] 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]] button : int; [[The Button that is pressed]]
} }
mixin @beta Efl.Ui.Clickable mixin @beta Efl.Input.Clickable
{ {
[[Efl UI clickable interface]] [[Efl input clickable interface]]
event_prefix: efl_ui; event_prefix: efl_input;
methods { methods {
press @protected { press @protected {
[[Change internal states that a button got pressed. [[Change internal states that a button got pressed.
@ -38,8 +38,8 @@ mixin @beta Efl.Ui.Clickable
} }
} }
events { events {
clicked: Efl.Ui.Clickable_Clicked; [[Called when object is in sequence pressed and unpressed, by the primary button]] clicked: Efl.Input.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,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]] 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]] 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]] longpressed: int; [[Called when the object receives a long press, event_info is the button that got pressed]]

2
src/lib/evas/canvas/meson.build
View File

@ -27,6 +27,7 @@ pub_eo_files = [
'efl_input_pointer.eo', 'efl_input_pointer.eo',
'efl_input_hold.eo', 'efl_input_hold.eo',
'efl_input_focus.eo', 'efl_input_focus.eo',
'efl_input_clickable.eo',
'efl_canvas_animation.eo', 'efl_canvas_animation.eo',
'efl_canvas_animation_alpha.eo', 'efl_canvas_animation_alpha.eo',
'efl_canvas_animation_rotate.eo', 'efl_canvas_animation_rotate.eo',
@ -168,6 +169,7 @@ evas_src += files([
'efl_input_pointer.c', 'efl_input_pointer.c',
'efl_input_hold.c', 'efl_input_hold.c',
'efl_input_focus.c', 'efl_input_focus.c',
'efl_input_clickable.c',
'efl_canvas_animation.c', 'efl_canvas_animation.c',
'efl_canvas_animation_alpha.c', 'efl_canvas_animation_alpha.c',
'efl_canvas_animation_rotate.c', 'efl_canvas_animation_rotate.c',

4
src/modules/elementary/clock_input_ctxpopup/clock_input_ctxpopup.c
View File

@ -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); field_obj = elm_button_add(ctx_mod->mod_data.base);
efl_event_callback_add 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 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_input_panel_enabled_set(field_obj, EINA_FALSE);
elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE); elm_entry_context_menu_disabled_set(field_obj, EINA_TRUE);
efl_event_callback_add 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); evas_object_data_set(field_obj, "_field_type", (void *)field_type);

24
src/tests/elementary/spec/efl_test_clickable.c
View File

@ -69,9 +69,9 @@ prepare_window(void)
*/ */
typedef struct { typedef struct {
Efl_Ui_Clickable_Clicked clicked_params; Efl_Input_Clickable_Clicked clicked_params;
unsigned int clicked; unsigned int clicked;
Efl_Ui_Clickable_Clicked clicked_all_params; Efl_Input_Clickable_Clicked clicked_all_params;
unsigned int clicked_all; unsigned int clicked_all;
unsigned int pressed; unsigned int pressed;
unsigned int unpressed; unsigned int unpressed;
@ -84,23 +84,23 @@ Clickable_Event_Register event_caller = { 0 };
static void static void
_event_register(void *data EINA_UNUSED, const Efl_Event *ev) _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, clicked);
EVENT_CHECK(CLICKED_ANY, clicked_all); EVENT_CHECK(CLICKED_ANY, clicked_all);
EVENT_CHECK(PRESSED, pressed); EVENT_CHECK(PRESSED, pressed);
EVENT_CHECK(UNPRESSED, unpressed); EVENT_CHECK(UNPRESSED, unpressed);
EVENT_CHECK(LONGPRESSED, long_pressed); 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.repeated = clicked->repeated;
event_caller.clicked_params.button = clicked->button; 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.repeated = clicked->repeated;
event_caller.clicked_all_params.button = clicked->button; 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_CALLBACKS_ARRAY_DEFINE(clickable,
{EFL_UI_EVENT_CLICKED, _event_register}, {EFL_INPUT_EVENT_CLICKED, _event_register},
{EFL_UI_EVENT_CLICKED_ANY, _event_register}, {EFL_INPUT_EVENT_CLICKED_ANY, _event_register},
{EFL_UI_EVENT_PRESSED, _event_register}, {EFL_INPUT_EVENT_PRESSED, _event_register},
{EFL_UI_EVENT_UNPRESSED, _event_register}, {EFL_INPUT_EVENT_UNPRESSED, _event_register},
{EFL_UI_EVENT_LONGPRESSED, _event_register}, {EFL_INPUT_EVENT_LONGPRESSED, _event_register},
) )
static void static void