kimcinoo
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

efl.ui.text: rename to efl.ui.textbox 

Summary:
This patch will rename efl.ui.text into efl.ui.textbox

Effected classes:
 - efl.ui.text_async   :  efl.ui.textbox_async
 - efl.ui.text_editable   :  efl.ui.textbox_editable **will be removed anyway**

Needs consider Classes:
- efl.ui.text_part
- efl.ui.text_factory.Emoticons
- efl.ui.text_factory.Fallback
- efl.ui.text_factory.Images

Reviewers: woohyun, segfaultxavi, bu5hm4n, zmike, YOhoho

Reviewed By: woohyun

Subscribers: cedric, #reviewers, #committers

Tags: #efl

Differential Revision: https://phab.enlightenment.org/D10835
This commit is contained in:
Ali Alzyod 2019-12-11 09:47:50 +09:00 committed by WooHyun Jung
parent ab67611c65
commit 3359e03500
28 changed files with 302 additions and 276 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -937,9 +937,9 @@ add_tests:
ADD_TEST(NULL, "Entries", "Entry Anchor2", test_entry_anchor2);
ADD_TEST(NULL, "Entries", "Entry Emoticon", test_entry_emoticon);
ADD_TEST(NULL, "Entries", "Entry Password", test_entry_password);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text", test_efl_ui_text);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Input Field", test_efl_ui_text_inputfield);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Text Label", test_efl_ui_text_label);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox", test_efl_ui_text);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Input Field", test_efl_ui_text_inputfield);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Textbox Label", test_efl_ui_text_label);
ADD_TEST_EO(NULL, "Entries", "Efl.Ui.Tags", test_ui_tags);
//------------------------------//

22
src/bin/elementary/test_efl_gfx_vg_value_provider.c
View File

@ -258,7 +258,7 @@ void values_input(Eo* box, const char* type)
char color_text[4][2] = { "R", "G", "B", "A" };
for (int i = 0; i < 4; i++)
{
values[i] = efl_add(EFL_UI_TEXT_CLASS, box,
values[i] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -270,7 +270,7 @@ void values_input(Eo* box, const char* type)
}
else if (!strcmp(type, "StrokeWidth"))
{
values[0] = efl_add(EFL_UI_TEXT_CLASS, box,
values[0] = efl_add(EFL_UI_TEXTBOX_CLASS, box,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -310,7 +310,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_content_set(win, efl_added));
//Create a label to show state of animation
label = efl_add(EFL_UI_TEXT_CLASS, win,
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_pack(box, efl_added));
@ -329,7 +329,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
efl_pack(box, efl_added));
//Path
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_text_set(efl_added, "Path examples : three_box.json\n"
@ -346,7 +346,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_text_multiline_set(efl_added, EINA_TRUE),
efl_pack(box_sub, efl_added));
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, 0, 0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_text_set(efl_added, "[Value Provider]"),
@ -361,7 +361,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_pack(box, efl_added));
//Path
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, 0, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -369,7 +369,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(box_sub, efl_added));
path_entry = efl_add(EFL_UI_TEXT_CLASS, box_sub,
path_entry = efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, 0.1, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -378,7 +378,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_gfx_hint_size_min_set(path_entry, EINA_SIZE2D(200, 10));
efl_text_set(efl_part(path_entry, "efl.text_guide"), "Enter path(ex: ** or Layer.Shape.Fill) ");
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, 0, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -398,7 +398,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
elm_object_focus_set(type_hoversel, EINA_TRUE);
efl_pack(box_sub, type_hoversel);
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, 0, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -479,7 +479,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
//Duration Text
snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
efl_add(EFL_UI_TEXT_CLASS, box_sub,
efl_add(EFL_UI_TEXTBOX_CLASS, box_sub,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -583,7 +583,7 @@ test_efl_gfx_vg_value_provider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNU
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, win,
efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),

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

@ -151,7 +151,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_content_set(win, efl_added));
//Create a label to show state of animation
label = efl_add(EFL_UI_TEXT_CLASS, win,
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_pack(box, efl_added));
@ -201,7 +201,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
//Duration Text
snprintf(buf, sizeof(buf), "Duration: %1.2fs", efl_ui_animation_view_duration_time_get(anim_view));
efl_add(EFL_UI_TEXT_CLASS, box2,
efl_add(EFL_UI_TEXTBOX_CLASS, box2,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_gfx_hint_align_set(efl_added, EVAS_HINT_FILL, EVAS_HINT_FILL),
@ -304,7 +304,7 @@ test_efl_ui_animation_view(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND),
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, win,
efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_gfx_hint_weight_set(efl_added, EFL_GFX_HINT_EXPAND, 0.1),
efl_gfx_hint_fill_set(efl_added, EINA_FALSE, EINA_FALSE),
efl_text_set(efl_added, "Evas Vg Json (Lottie) Loader is not supported, Only Static Vector Image is available!"),

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

@ -11,8 +11,8 @@ _apply_style(Eo *obj, size_t start_pos, size_t end_pos, const char *style)
{
Efl_Text_Cursor *start, *end;
start = efl_ui_text_cursor_create(obj);
end = efl_ui_text_cursor_create(obj);
start = efl_ui_textbox_cursor_create(obj);
end = efl_ui_textbox_cursor_create(obj);
efl_text_cursor_position_set(start, start_pos);
efl_text_cursor_position_set(end, end_pos);
@ -27,8 +27,8 @@ static Eo *
_create_label(Eo *win, Eo *bx)
{
Eo *en;
en = efl_add(EFL_UI_TEXT_CLASS, win);
printf("Added Efl.Ui.Text object\n");
en = efl_add(EFL_UI_TEXTBOX_CLASS, win);
printf("Added Efl.Ui.Textbox object\n");
efl_text_interactive_editable_set(en, EINA_FALSE);
efl_pack(bx, en);
return en;
@ -156,13 +156,13 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
efl_content_set(win, bx);
en = efl_add(EFL_UI_TEXT_CLASS, bx,
en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_multiline_set(efl_added, EINA_TRUE));
printf("Added Efl.Ui.Text object\n");
printf("Added Efl.Ui.Textbox object\n");
efl_text_interactive_editable_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
efl_text_font_family_set(en, "Sans");
efl_text_font_size_set(en, 12);
@ -215,13 +215,13 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
efl_gfx_hint_weight_set(bx, EFL_GFX_HINT_EXPAND, EFL_GFX_HINT_EXPAND);
efl_content_set(win, bx);
en = efl_add(EFL_UI_TEXT_CLASS, bx,
en = efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_multiline_set(efl_added, EINA_FALSE));
efl_text_interactive_editable_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
printf("Added Efl.Ui.Text object\n");
printf("Added Efl.Ui.Textbox object\n");
efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
efl_text_set(efl_part(en, "efl.text_guide"), "Enter you name here");
@ -233,7 +233,7 @@ test_efl_ui_text_inputfield(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED
efl_text_interactive_editable_set(en, EINA_TRUE);
efl_text_wrap_set(en, EFL_TEXT_FORMAT_WRAP_WORD);
efl_text_multiline_set(en, EINA_TRUE);
efl_ui_text_scrollable_set(en, EINA_TRUE);
efl_ui_textbox_scrollable_set(en, EINA_TRUE);
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, 0.5);
efl_pack(bx, en);

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

@ -5,7 +5,7 @@
#include <Elementary.h>
#include <Efl_Ui.h>
#include "elm_spinner_eo.h"
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const int default_font_size = 48;
typedef struct _Filter_Image
@ -349,8 +349,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE));
efl_pack(box, box2);
/* FIXME: Efl.Ui.Text doesn't work as expected. */
o = efl_add(EFL_UI_TEXT_CLASS, win,
/* FIXME: Efl.Ui.Textbox doesn't work as expected. */
o = efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_gfx_hint_weight_set(efl_added, 0.0, 1.0),
efl_gfx_hint_align_set(efl_added, 1.0, 0.5));
efl_text_set(o, "Filter:");
@ -514,8 +514,8 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
"blur { 3, ox = 1, oy = 1, color = 'black' }"
"blend { color = 'lime' }";
o = code = efl_add(EFL_UI_TEXT_CLASS, win,
efl_ui_text_scrollable_set(efl_added, EINA_TRUE),
o = code = efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_ui_textbox_scrollable_set(efl_added, EINA_TRUE),
efl_text_interactive_editable_set(efl_added, EINA_TRUE),
efl_text_multiline_set(efl_added, EINA_TRUE));
efl_event_callback_add(o, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER, _code_changed_hack, win);

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

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
#define MAX_NUM_OF_CONTENT 17
const Efl_Class *content_class[MAX_NUM_OF_CONTENT];
@ -80,7 +80,7 @@ _create_box_contents(Evas_Object *box)
efl_pack_end(hbox, efl_added));
evas_object_data_set(radio, "data", content);
content = efl_add(EFL_UI_TEXT_CLASS, content,
content = efl_add(EFL_UI_TEXTBOX_CLASS, content,
efl_text_set(efl_added, "box"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack_end(content, efl_added));
@ -136,7 +136,7 @@ test_part_background(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
content_class[5] = EFL_UI_BUTTON_CLASS;
content_class[6] = EFL_UI_CHECK_CLASS;
content_class[7] = EFL_UI_RADIO_CLASS;
content_class[8] = EFL_UI_TEXT_CLASS;
content_class[8] = EFL_UI_TEXTBOX_CLASS;
content_class[9] = EFL_UI_FLIP_CLASS;
content_class[10] = EFL_UI_PANES_CLASS;
content_class[11] = EFL_UI_VIDEO_CLASS;

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

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const struct {
Evas_Image_Orient orient;
const char *name;
@ -813,7 +813,7 @@ test_image_zoomable_animated(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSE
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL),
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Clicking the image will play/pause animation."),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_gfx_hint_weight_set(efl_added, 1, 0),

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

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
/* A simple test, just displaying clock in its default format */
Evas_Object *dt1, *dt2, *dt3, *dt4;
@ -84,7 +84,7 @@ test_ui_clock(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Editable Clock:"),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_align_set(efl_added, 0, 0.5),

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

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void
_inc_clicked(void *data, const Efl_Event *ev EINA_UNUSED)
{
@ -28,7 +28,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_frame_autocollapse_set(efl_added, EINA_FALSE));
efl_text_set(f, "Test 1");
txt = efl_add(EFL_UI_TEXT_CLASS, f);
txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
efl_text_set(txt, "Not collapseable");
efl_content_set(f, txt);
@ -37,7 +37,7 @@ test_ui_frame(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event_
efl_ui_frame_autocollapse_set(efl_added, EINA_TRUE));
efl_text_set(f, "Test2");
txt = efl_add(EFL_UI_TEXT_CLASS, f);
txt = efl_add(EFL_UI_TEXTBOX_CLASS, f);
efl_text_set(txt, "Collapseable");
efl_content_set(f, txt);

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

@ -3,7 +3,7 @@
#endif
#include <Elementary.h>
#include <Efl_Ui.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static const struct {
Efl_Gfx_Image_Orientation orient;
const char *name;
@ -302,7 +302,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
efl_gfx_hint_weight_set(box, 1.0, 1.0);
efl_content_set(win, box);
o = efl_add(EFL_UI_TEXT_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
o = efl_add(EFL_UI_TEXTBOX_CLASS, box, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
efl_text_wrap_set(o, EFL_TEXT_FORMAT_WRAP_MIXED);
efl_gfx_hint_weight_set(o, 1.0, 1.0);
efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
@ -340,7 +340,7 @@ test_remote_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_i
efl_gfx_hint_fill_set(o, EINA_TRUE, EINA_TRUE);
efl_pack(box, box2);
o = efl_add(EFL_UI_TEXT_CLASS, box2,
o = efl_add(EFL_UI_TEXTBOX_CLASS, box2,
efl_text_interactive_editable_set(efl_added, EINA_FALSE)
);
efl_text_set(o, "URL:");
@ -388,7 +388,7 @@ test_click_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_in
efl_pack(box, im);
elm_object_focus_set(im, EINA_TRUE);
label = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
label = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
efl_text_set(label, "<b>Press Return/Space/KP_Return key on image to transit.</b>");
efl_gfx_hint_weight_set(label, 0.0, 0.0);
efl_gfx_hint_fill_set(label, EINA_TRUE, EINA_TRUE);
@ -451,7 +451,7 @@ _create_image(Eo *data, Eina_Bool async, Eina_Bool preload, Eina_Bool logo)
status_text = efl_key_data_get(win, "phld");
if (!status_text)
{
status_text = efl_add(EFL_UI_TEXT_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
status_text = efl_add(EFL_UI_TEXTBOX_CLASS, win, efl_text_interactive_editable_set(efl_added, EINA_FALSE));
efl_gfx_hint_weight_set(status_text, 1.0, 0);
efl_gfx_hint_fill_set(status_text, EINA_TRUE, EINA_TRUE);
efl_key_data_set(win, "phld", status_text);
@ -541,7 +541,7 @@ test_load_ui_image(void *data EINA_UNUSED, Eo *obj EINA_UNUSED, void *event_inf
efl_gfx_hint_weight_set(hbox, 1.0, 0.0);
efl_gfx_hint_fill_set(hbox, EINA_TRUE, EINA_FALSE);
{
label = efl_add(EFL_UI_TEXT_CLASS, win,
label = efl_add(EFL_UI_TEXTBOX_CLASS, win,
efl_text_set(efl_added, "Async load options:"),
efl_gfx_hint_weight_set(efl_added, 0.0, 0.0),
efl_gfx_hint_fill_set(efl_added, EINA_TRUE, EINA_FALSE),

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

@ -4,7 +4,7 @@
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
#include "test.h"
static Eo *layout, *btn1, *btn2, *btn3;
@ -153,7 +153,7 @@ _setter_add(Eo *vbox, Eo *btn, Options option)
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
efl_pack(vbox, efl_added));
efl_add(EFL_UI_TEXT_CLASS, hbox,
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
efl_text_set(efl_added, text),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_text_vertical_align_set(efl_added, 0.5),
@ -207,7 +207,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
efl_pack(hbox, efl_added));
efl_add(EFL_UI_TEXT_CLASS, hbox,
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
efl_text_set(efl_added, "to"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_text_horizontal_align_set(efl_added, 0.5),
@ -215,7 +215,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_gfx_hint_weight_set(efl_added, 0, EFL_GFX_HINT_EXPAND),
efl_pack(hbox, efl_added));
efl_add(EFL_UI_TEXT_CLASS, hbox,
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
efl_text_set(efl_added, "relative"),
efl_text_horizontal_align_set(efl_added, 0.5),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
@ -234,7 +234,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
efl_pack(vbox, efl_added));
efl_add(EFL_UI_TEXT_CLASS, hbox,
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
efl_text_set(efl_added, "align_x"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),
@ -254,7 +254,7 @@ _button_frame_add(Eo *box, Eo *btn)
efl_gfx_arrangement_content_padding_set(efl_added, 2, 2),
efl_pack(vbox, efl_added));
efl_add(EFL_UI_TEXT_CLASS, hbox,
efl_add(EFL_UI_TEXTBOX_CLASS, hbox,
efl_text_set(efl_added, "align_y"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_gfx_hint_size_min_set(efl_added, EINA_SIZE2D(40, 0)),

14
src/bin/elementary/test_ui_slider.c
View File

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void
_slider_changed_cb(void *data EINA_UNUSED, const Efl_Event *ev)
{
@ -59,7 +59,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Horizontal"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -72,7 +72,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_event_callback_add(efl_added, EFL_UI_SLIDER_EVENT_SLIDER_DRAG_STOP, _slider_drag_stop_cb, NULL),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Horizontal Inverted"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -83,7 +83,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Manual step"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -94,7 +94,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_ui_range_step_set(efl_added, 0.1),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Disabled"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -106,7 +106,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
elm_object_disabled_set(efl_added, EINA_TRUE),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Vertical"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -139,7 +139,7 @@ test_ui_slider(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *event
efl_ui_layout_orientation_set(efl_added, EFL_UI_LAYOUT_ORIENTATION_VERTICAL | EFL_UI_LAYOUT_ORIENTATION_INVERTED),
efl_pack(hbx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Limit"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));

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

@ -3,7 +3,7 @@
#endif
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static double
_step_size_calculate(double min, double max)
{
@ -40,7 +40,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
bx = efl_add(EFL_UI_BOX_CLASS, win,
efl_content_set(win, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Horizontal"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -50,7 +50,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_slider_interval_value_set(efl_added, 0.4, 0.9),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Manual step"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -62,7 +62,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
efl_ui_range_step_set(efl_added, step),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Disabled"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -75,7 +75,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
elm_object_disabled_set(efl_added, EINA_TRUE),
efl_pack(bx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Vertical"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));
@ -101,7 +101,7 @@ test_slider_interval(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void
elm_object_disabled_set(efl_added, EINA_TRUE),
efl_pack(hbx, efl_added));
efl_add(EFL_UI_TEXT_CLASS, bx,
efl_add(EFL_UI_TEXTBOX_CLASS, bx,
efl_text_set(efl_added, "Limited (100-500)"),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_pack(bx, efl_added));

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

@ -4,7 +4,7 @@
#include <Efl_Ui.h>
#include <Elementary.h>
#include "elm_priv.h" //FIXME remove this once efl.ui.text doesn't need elm_general.h
#include "elm_priv.h" //FIXME remove this once efl.ui.textbox doesn't need elm_general.h
static void
_bt_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_UNUSED)
@ -42,7 +42,7 @@ _bt2_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
// - With EO APIs, efl_gfx_hint_size_min_set() is safe to call as EFL will
// only set the restricted min size (and combine them for calculation).
lb = efl_add(EFL_UI_TEXT_CLASS, dia,
lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia,
efl_text_set(efl_added, "This is a non-resizable dialog."),
efl_gfx_hint_size_min_set(efl_added, size),
efl_gfx_hint_size_max_set(efl_added, size),
@ -84,7 +84,7 @@ _bt3_clicked_cb(void *data, Evas_Object *obj EINA_UNUSED, void *event_info EINA_
efl_ui_win_autodel_set(efl_added, EINA_TRUE),
efl_text_set(efl_added, "Min/Max Size Dialog"));
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
//lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
lb = elm_label_add(dia);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);
@ -111,7 +111,7 @@ _bt4_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *even
efl_text_set(efl_added, "Min/Max Size Dialog")
);
//lb = efl_add(EFL_UI_TEXT_CLASS, dia);,
//lb = efl_add(EFL_UI_TEXTBOX_CLASS, dia);,
lb = elm_label_add(dia);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_HINTS_CHANGED, _size_update, lb);
efl_event_callback_add(dia, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _size_update, lb);

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

@ -16,8 +16,8 @@
//FIXME this can go away when efl_ui_text doesn't need elm_general
# include <elm_general.h>
# include <efl_text_interactive.eo.h>
# include <efl_ui_text.eo.h>
# include <efl_ui_text_async.eo.h>
# include <efl_ui_textbox.eo.h>
# include <efl_ui_textbox_async.eo.h>
#define NUM_ITEMS 400
@ -151,7 +151,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
ibox = efl_add(EFL_UI_BOX_CLASS, item);
efl_ui_layout_orientation_set(ibox, EFL_UI_LAYOUT_ORIENTATION_HORIZONTAL);
txt = efl_add(EFL_UI_TEXT_CLASS, ibox);
txt = efl_add(EFL_UI_TEXTBOX_CLASS, ibox);
efl_gfx_hint_weight_set(txt, 0.95, EFL_GFX_HINT_EXPAND);
efl_text_horizontal_align_set(txt, 0.2);
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@ -229,7 +229,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_pack_end(wbox, list);
/*select mode */
txt = efl_add(EFL_UI_TEXT_CLASS, wbox);
txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
efl_text_horizontal_align_set(txt, 0.02);
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
@ -256,7 +256,7 @@ elm_main(int argc EINA_UNUSED, char **argv)
efl_event_callback_add(bbox, EFL_UI_RADIO_GROUP_EVENT_VALUE_CHANGED, _select_radio_changed, list);
/* scroll mode */
txt = efl_add(EFL_UI_TEXT_CLASS, wbox);
txt = efl_add(EFL_UI_TEXTBOX_CLASS, wbox);
efl_gfx_hint_weight_set(txt, EFL_GFX_HINT_EXPAND, 0.01);
efl_text_interactive_selection_allowed_set(txt, EINA_FALSE);
efl_text_horizontal_align_set(txt, 0.02);

10
src/examples/elementary/efl_ui_unit_converter.cs
View File

@ -32,7 +32,7 @@ public class Example
private static void ShowErrorPopup(Efl.Ui.Win win, string message)
{
Efl.Ui.AlertPopup popup = new Efl.Ui.AlertPopup(win);
Efl.Ui.Text popup_text = new Efl.Ui.Text(popup);
Efl.Ui.Textbox popup_text = new Efl.Ui.Textbox(popup);
popup_text.SetText($"Error: {message}");
popup.SetContent(popup_text);
popup.SetVisible(true);
@ -68,12 +68,12 @@ public class Example
box.DoPack(miles_box);
Efl.Ui.Text miles_label = new Efl.Ui.Text(miles_box);
Efl.Ui.Textbox miles_label = new Efl.Ui.Textbox(miles_box);
miles_label.SetText("Miles:");
miles_label.SetSize(size);
miles_label.SetVisible(true);
Efl.Ui.Text miles_input = new Efl.Ui.Text(miles_box);
Efl.Ui.Textbox miles_input = new Efl.Ui.Textbox(miles_box);
miles_input.SetText("");
miles_input.SetScrollable(true);
miles_input.SetEditable(true);
@ -95,12 +95,12 @@ public class Example
box.DoPack(kms_box);
Efl.Ui.Text kms_label = new Efl.Ui.Text(kms_box);
Efl.Ui.Textbox kms_label = new Efl.Ui.Textbox(kms_box);
kms_label.SetText("Kilometers:");
kms_label.SetSize(size);
kms_label.SetVisible(true);
Efl.Ui.TextEditable kms_input = new Efl.Ui.TextEditable(kms_box);
Efl.Ui.TextboxEditable kms_input = new Efl.Ui.TextboxEditable(kms_box);
kms_input.SetText("");
kms_input.SetScrollable(true);
kms_input.SetSize(size);

8
src/examples/elementary/table_cxx_example_01.cc
View File

@ -34,19 +34,19 @@ efl_main(void *data EINA_UNUSED, const Efl_Event *ev EINA_UNUSED)
// FIXME
// table.homogeneous_set(true);
efl::ui::Text label(instantiate, win);
efl::ui::Textbox label(instantiate, win);
label.text_set("label 0");
table.pack_table(label, 0, 0, 1, 1);
efl::ui::Text label1(instantiate, win);
efl::ui::Textbox label1(instantiate, win);
label1.text_set("label 1");
table.pack_table(label1, 1, 0, 1, 1);
efl::ui::Text label2(instantiate, win);
efl::ui::Textbox label2(instantiate, win);
label2.text_set("label 2");
table.pack_table(label2, 0, 1, 1, 1);
efl::ui::Text label3(instantiate, win);
efl::ui::Textbox label3(instantiate, win);
label3.text_set("label 3");
table.pack_table(label3, 1, 1, 1, 1);
}

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

@ -226,8 +226,8 @@ EAPI Eina_Bool efl_ui_win_autodel_get(const Efl_Ui_Win *obj);
typedef void (*Context_Item_Clicked_Cb)(void *data, Eo *obj, void *event_info);
# include <efl_text_interactive.eo.h>
# include <efl_ui_text.eo.h>
# include <efl_ui_text_async.eo.h>
# include <efl_ui_textbox.eo.h>
# include <efl_ui_textbox_async.eo.h>
# include <efl_ui_animation_view.eo.h>
# include <efl_ui_clock.eo.h>

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

@ -197,11 +197,11 @@ field_create(Eo *obj, Efl_Ui_Clock_Type field_type)
}
else
{
field_obj = efl_add(EFL_UI_TEXT_CLASS,obj,
field_obj = efl_add(EFL_UI_TEXTBOX_CLASS,obj,
efl_text_multiline_set(efl_added, EINA_FALSE),
efl_text_interactive_editable_set(efl_added, EINA_FALSE),
efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
efl_ui_text_context_menu_disabled_set(efl_added, EINA_TRUE));
efl_ui_textbox_context_menu_disabled_set(efl_added, EINA_TRUE));
}
evas_object_data_set(field_obj, "_field_type", (void *)field_type);

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

@ -754,10 +754,10 @@ _view_init(Evas_Object *obj, Efl_Ui_Tags_Data *sd)
if (!sd->label) return;
elm_widget_element_update(obj, sd->label, PART_NAME_LABEL);
sd->entry = efl_add(EFL_UI_TEXT_CLASS, sd->box,
sd->entry = efl_add(EFL_UI_TEXTBOX_CLASS, sd->box,
efl_text_multiline_set(efl_added, EINA_FALSE),
efl_text_set(efl_added, ""),
efl_ui_text_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
efl_ui_textbox_cnp_mode_set(efl_added, EFL_UI_SELECTION_FORMAT_MARKUP),
efl_input_text_input_panel_autoshow_set(efl_added, EINA_FALSE),
efl_text_interactive_editable_set(efl_added, EINA_TRUE),
efl_composite_attach(obj, efl_added));

9
src/lib/elementary/efl_ui_text_async.eo
View File

@ -1,9 +0,0 @@
class @beta Efl.Ui.Text_Async extends Efl.Ui.Text
{
[[Efl UI text async class
]]
data: null;
implements {
Efl.Object.constructor;
}
}

344
src/lib/elementary/efl_ui_text.c → src/lib/elementary/efl_ui_textbox.c
View File

File diff suppressed because it is too large Load Diff

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

@ -1,4 +1,4 @@
class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
class @beta Efl.Ui.Textbox extends Efl.Ui.Layout_Base implements Efl.Input.Clickable,
Efl.Access.Text, Efl.Access.Editable.Text, Efl.File, Efl.Input_Text
composites
Efl.Text_Interactive, Efl.Text_Markup

9
src/lib/elementary/efl_ui_textbox_async.eo Normal file
View File

@ -0,0 +1,9 @@
class @beta Efl.Ui.Textbox_Async extends Efl.Ui.Textbox
{
[[Efl UI textbox async class
]]
data: null;
implements {
Efl.Object.constructor;
}
}

12
src/lib/elementary/elc_fileselector_entry.c
View File

@ -58,9 +58,9 @@ static const Evas_Smart_Cb_Description _smart_callbacks[] =
}
SIG_FWD(CHANGED, ELM_FILESELECTOR_ENTRY_EVENT_CHANGED)
SIG_FWD(PRESS, ELM_FILESELECTOR_ENTRY_EVENT_PRESS)
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE)
SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY)
SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT)
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE)
SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY)
SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT)
#undef SIG_FWD
#define SIG_FWD(name, event) \
@ -249,9 +249,9 @@ _elm_fileselector_entry_efl_canvas_group_group_add(Eo *obj, Elm_Fileselector_Ent
SIG_FWD(CHANGED, ELM_ENTRY_EVENT_CHANGED);
SIG_FWD(ACTIVATED, ELM_ENTRY_EVENT_ACTIVATED);
SIG_FWD(PRESS, ELM_ENTRY_EVENT_PRESS);
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXT_EVENT_SELECTION_PASTE);
SIG_FWD(SELECTION_COPY, EFL_UI_TEXT_EVENT_SELECTION_COPY);
SIG_FWD(SELECTION_CUT, EFL_UI_TEXT_EVENT_SELECTION_CUT);
SIG_FWD(SELECTION_PASTE, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE);
SIG_FWD(SELECTION_COPY, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY);
SIG_FWD(SELECTION_CUT, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT);
#undef SIG_FWD
#define SIG_FWD(name, event) \
evas_object_smart_callback_add(priv->entry, event, _##name##_fwd, obj)

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

@ -1588,7 +1588,7 @@ _paste_cb(void *data,
if (!sd) return;
efl_event_callback_legacy_call
(data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL);
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
sd->selection_asked = EINA_TRUE;
@ -1643,7 +1643,7 @@ _cut_cb(void *data,
if (!sd) return;
efl_event_callback_legacy_call
(data, EFL_UI_TEXT_EVENT_SELECTION_CUT, NULL);
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_CUT, NULL);
/* Store it */
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
@ -1667,7 +1667,7 @@ _copy_cb(void *data,
if (!sd) return;
efl_event_callback_legacy_call
(data, EFL_UI_TEXT_EVENT_SELECTION_COPY, NULL);
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_COPY, NULL);
sd->sel_mode = EINA_FALSE;
if (!_elm_config->desktop_entry)
{
@ -2454,7 +2454,7 @@ _entry_paste_request_signal_cb(void *data,
// supported
// if ((type == ELM_SEL_TYPE_PRIMARY) && _entry_win_is_wl(data)) return;
efl_event_callback_legacy_call
(data, EFL_UI_TEXT_EVENT_SELECTION_PASTE, NULL);
(data, EFL_UI_TEXTBOX_EVENT_SELECTION_PASTE, NULL);
top = _entry_win_get(data);
if (top)

4
src/lib/elementary/elm_priv.h
View File

@ -170,8 +170,8 @@
//FIXME this needs to not use elm_general.h and go to Efl_Ui.h
# include <elm_general.h>
# include <efl_text_interactive.eo.h>
# include <efl_ui_text.eo.h>
# include <efl_ui_text_async.eo.h>
# include <efl_ui_textbox.eo.h>
# include <efl_ui_textbox_async.eo.h>
extern const char *_efl_model_property_itemw;
extern const char *_efl_model_property_itemh;

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

@ -79,12 +79,12 @@ pub_eo_files = [
'efl_ui_table.eo',
'efl_ui_table_static.eo',
'efl_text_interactive.eo',
'efl_ui_text.eo',
'efl_ui_textbox.eo',
'efl_ui_popup.eo',
'efl_ui_popup_part_backwall.eo',
'efl_ui_alert_popup.eo',
'efl_ui_alert_popup_part_title.eo',
'efl_ui_text_async.eo',
'efl_ui_textbox_async.eo',
'efl_ui_text_factory_images.eo',
'efl_ui_text_factory_emoticons.eo',
'efl_ui_text_factory_fallback.eo',
@ -873,7 +873,7 @@ elementary_src = [
'efl_ui_table_static.c',
'efl_ui_table_layout.c',
'efl_ui_table_private.h',
'efl_ui_text.c',
'efl_ui_textbox.c',
'efl_ui_text_factory_images.c',
'efl_ui_text_factory_emoticons.c',
'efl_ui_text_factory_fallback.c',