enlightenment/efl
enlightenment
/
efl
8
7
Fork 15
Code Issues 12 Pull Requests 3 Projects Releases Wiki Activity

Ui text: bring back selection handlers support

This commit is contained in:
Daniel Hirt 2016-07-10 16:52:14 +00:00
parent fe69830261
commit 113f828b3c
2 changed files with 55 additions and 71 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/bin/elementary/test_entry.c
View File

@ -2968,6 +2968,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_canvas_text_cursor_position_set(cur, 2); efl_canvas_text_cursor_position_set(cur, 2);
efl_canvas_text_cursor_object_item_insert(cur, "size=32x32 href=emoticon"); efl_canvas_text_cursor_object_item_insert(cur, "size=32x32 href=emoticon");
efl_ui_text_interactive_editable_set(en, EINA_TRUE); efl_ui_text_interactive_editable_set(en, EINA_TRUE);
efl_ui_text_selection_handler_disabled_set(en, EINA_FALSE);
efl_ui_text_scrollable_set(en, EINA_TRUE); efl_ui_text_scrollable_set(en, EINA_TRUE);
evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); evas_object_size_hint_weight_set(en, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL); evas_object_size_hint_align_set(en, EVAS_HINT_FILL, EVAS_HINT_FILL);

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

@ -253,7 +253,7 @@ struct _Mod_Api
void (*obj_longpress)(Evas_Object *obj); void (*obj_longpress)(Evas_Object *obj);
}; };
static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd); static void _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd, const char *file);
static void _magnifier_move(void *data); static void _magnifier_move(void *data);
static void _update_decorations(Eo *obj); static void _update_decorations(Eo *obj);
static void _create_text_cursors(Efl_Ui_Text_Data *sd); static void _create_text_cursors(Efl_Ui_Text_Data *sd);
@ -267,6 +267,7 @@ static void _efl_ui_text_anchor_hover_parent_set(Eo *obj, Efl_Ui_Text_Data *sd,
static const char* _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd); static const char* _efl_ui_text_selection_get(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *sd);
static void _edje_signal_emit(Efl_Ui_Text_Data *obj, const char *sig, const char *src); static void _edje_signal_emit(Efl_Ui_Text_Data *obj, const char *sig, const char *src);
static void _decoration_defer_all(Eo *obj); static void _decoration_defer_all(Eo *obj);
static inline Eo * _decoration_create(Efl_Ui_Text_Data *sd, const char *file, const char *source, Eina_Bool above);
static Mod_Api * static Mod_Api *
_module_find(Evas_Object *obj EINA_UNUSED) _module_find(Evas_Object *obj EINA_UNUSED)
@ -541,55 +542,45 @@ _viewport_region_get(Evas_Object *obj)
} }
static void static void
_update_selection_handler(Evas_Object *obj) _update_selection_handler(Eo *obj)
{ {
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
Evas_Coord sx, sy, sh; Evas_Coord sx, sy, sh;
Evas_Coord ent_x, ent_y;
Evas_Coord ex, ey, eh; Evas_Coord ex, ey, eh;
int start_pos, end_pos, last_pos; Evas_Coord ent_x, ent_y;
int start_pos, end_pos;
if (!sd->sel_handler_disabled) if (!sd->sel_handler_disabled)
{ {
Eina_Rectangle *rect; Eina_Rectangle *rect;
Evas_Coord hx, hy; Evas_Coord hx, hy;
Eina_Bool hidden = EINA_FALSE; Eina_Bool hidden = EINA_FALSE;
Efl_Canvas_Text_Cursor *sel_start, *sel_end;
efl_ui_text_interactive_selection_cursors_get(obj, &sel_start, &sel_end);
if (!sd->start_handler) if (!sd->start_handler)
_create_selection_handlers(obj, sd); {
const char *file;
efl_file_get(sd->entry_edje, &file, NULL);
_create_selection_handlers(obj, sd, file);
}
rect = _viewport_region_get(obj); rect = _viewport_region_get(obj);
start_pos = edje_object_part_text_cursor_pos_get start_pos = efl_canvas_text_cursor_position_get(sel_start);
(sd->entry_edje, "elm.text", EDJE_CURSOR_SELECTION_BEGIN); end_pos = efl_canvas_text_cursor_position_get(sel_end);
end_pos = edje_object_part_text_cursor_pos_get
(sd->entry_edje, "elm.text", EDJE_CURSOR_SELECTION_END);
evas_object_geometry_get(sd->entry_edje, &ent_x, &ent_y, NULL, NULL); evas_object_geometry_get(sd->entry_edje, &ent_x, &ent_y, NULL, NULL);
last_pos = edje_object_part_text_cursor_pos_get(sd->entry_edje, "elm.text",
EDJE_CURSOR_MAIN); efl_canvas_text_cursor_geometry_get(sel_start,
edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text", EFL_CANVAS_TEXT_CURSOR_TYPE_BEFORE,
EDJE_CURSOR_MAIN, start_pos); &sx, &sy, NULL, &sh,
edje_object_part_text_cursor_geometry_get(sd->entry_edje, "elm.text", NULL, NULL, NULL, NULL);
&sx, &sy, NULL, &sh); hx = ent_x + sx;
edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text", hy = ent_y + sy + sh;
EDJE_CURSOR_MAIN, end_pos); evas_object_move(sd->start_handler, hx, hy);
edje_object_part_text_cursor_geometry_get(sd->entry_edje, "elm.text",
&ex, &ey, NULL, &eh);
edje_object_part_text_cursor_pos_set(sd->entry_edje, "elm.text",
EDJE_CURSOR_MAIN, last_pos);
if (start_pos < end_pos)
{
hx = ent_x + sx;
hy = ent_y + sy + sh;
evas_object_move(sd->start_handler, hx, hy);
}
else
{
hx = ent_x + ex;
hy = ent_y + ey + eh;
evas_object_move(sd->start_handler, hx, hy);
}
if (!eina_rectangle_xcoord_inside(rect, hx) || if (!eina_rectangle_xcoord_inside(rect, hx) ||
!eina_rectangle_ycoord_inside(rect, hy)) !eina_rectangle_ycoord_inside(rect, hy))
{ {
@ -608,19 +599,14 @@ _update_selection_handler(Evas_Object *obj)
sd->start_handler_shown = EINA_FALSE; sd->start_handler_shown = EINA_FALSE;
} }
hidden = EINA_FALSE; efl_canvas_text_cursor_geometry_get(sel_end,
if (start_pos < end_pos) EFL_CANVAS_TEXT_CURSOR_TYPE_BEFORE,
{ &ex, &ey, NULL, &eh,
hx = ent_x + ex; NULL, NULL, NULL, NULL);
hy = ent_y + ey + eh; hx = ent_x + ex;
evas_object_move(sd->end_handler, hx, hy); hy = ent_y + ey + eh;
} evas_object_move(sd->end_handler, hx, hy);
else
{
hx = ent_x + sx;
hy = ent_y + sy + sh;
evas_object_move(sd->end_handler, hx, hy);
}
if (!eina_rectangle_xcoord_inside(rect, hx) || if (!eina_rectangle_xcoord_inside(rect, hx) ||
!eina_rectangle_ycoord_inside(rect, hy)) !eina_rectangle_ycoord_inside(rect, hy))
{ {
@ -3017,8 +3003,11 @@ _selection_handlers_offset_calc(Evas_Object *obj, Evas_Object *handler, Evas_Coo
EFL_UI_TEXT_DATA_GET(obj, sd); EFL_UI_TEXT_DATA_GET(obj, sd);
evas_object_geometry_get(sd->entry_edje, &ex, &ey, NULL, NULL); evas_object_geometry_get(sd->entry_edje, &ex, &ey, NULL, NULL);
edje_object_part_text_cursor_geometry_get(sd->entry_edje, "elm.text", efl_canvas_text_cursor_geometry_get(
&cx, &cy, &cw, &ch); efl_canvas_text_cursor_get(obj),
EFL_CANVAS_TEXT_CURSOR_TYPE_BEFORE,
&cx, &cy, &cw, &ch,
NULL, NULL, NULL, NULL);
edje_object_size_min_calc(handler, NULL, &hh); edje_object_size_min_calc(handler, NULL, &hh);
sd->ox = canvasx - (ex + cx + (cw / 2)); sd->ox = canvasx - (ex + cx + (cw / 2));
@ -3105,12 +3094,8 @@ _start_handler_mouse_move_cb(void *data,
Evas_Event_Mouse_Move *ev = event_info; Evas_Event_Mouse_Move *ev = event_info;
Evas_Coord ex, ey; Evas_Coord ex, ey;
Evas_Coord cx, cy; Evas_Coord cx, cy;
Efl_Canvas_Text_Cursor *main_cur;
int pos; int pos;
Eo *text_obj = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
main_cur = efl_canvas_text_cursor_get(text_obj);
evas_object_geometry_get(sd->entry_edje, &ex, &ey, NULL, NULL); evas_object_geometry_get(sd->entry_edje, &ex, &ey, NULL, NULL);
cx = ev->cur.canvas.x - sd->ox - ex; cx = ev->cur.canvas.x - sd->ox - ex;
cy = ev->cur.canvas.y - sd->oy - ey; cy = ev->cur.canvas.y - sd->oy - ey;
@ -3120,7 +3105,7 @@ _start_handler_mouse_move_cb(void *data,
pos = efl_canvas_text_cursor_position_get(sd->sel_handler_cursor); pos = efl_canvas_text_cursor_position_get(sd->sel_handler_cursor);
/* Set the main cursor. */ /* Set the main cursor. */
efl_canvas_text_cursor_position_set(main_cur, pos); efl_canvas_text_cursor_position_set(efl_canvas_text_cursor_get(data), pos);
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE; sd->long_pressed = EINA_FALSE;
@ -3154,12 +3139,12 @@ _end_handler_mouse_down_cb(void *data,
if (start_pos < end_pos) if (start_pos < end_pos)
{ {
pos = end_pos; pos = end_pos;
sd->sel_handler_cursor = sel_start; sd->sel_handler_cursor = sel_end;
} }
else else
{ {
pos = start_pos; pos = start_pos;
sd->sel_handler_cursor = sel_end; sd->sel_handler_cursor = sel_start;
} }
efl_canvas_text_cursor_position_set(main_cur, pos); efl_canvas_text_cursor_position_set(main_cur, pos);
@ -3206,9 +3191,7 @@ _end_handler_mouse_move_cb(void *data,
efl_canvas_text_cursor_coord_set(sd->sel_handler_cursor, cx, cy); efl_canvas_text_cursor_coord_set(sd->sel_handler_cursor, cx, cy);
pos = efl_canvas_text_cursor_position_get(sd->sel_handler_cursor); pos = efl_canvas_text_cursor_position_get(sd->sel_handler_cursor);
/* Set the main cursor. */ /* Set the main cursor. */
efl_canvas_text_cursor_position_set( efl_canvas_text_cursor_position_set(efl_canvas_text_cursor_get(data), pos);
edje_object_part_swallow_get(sd->entry_edje, "elm.text"),
pos);
ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del); ELM_SAFE_FREE(sd->longpress_timer, ecore_timer_del);
sd->long_pressed = EINA_FALSE; sd->long_pressed = EINA_FALSE;
if (_elm_config->magnifier_enable) if (_elm_config->magnifier_enable)
@ -3398,14 +3381,14 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
} }
static void static void
_create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd) _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd,
const char *file)
{ {
Evas_Object *handle; Evas_Object *handle;
const char *style = elm_widget_style_get(obj);
handle = edje_object_add(evas_object_evas_get(obj)); handle = _decoration_create(sd, file, "elm/entry/handler/start", EINA_TRUE);
evas_object_pass_events_set(handle, EINA_FALSE);
sd->start_handler = handle; sd->start_handler = handle;
_elm_theme_object_set(obj, handle, "entry", "handler/start", style);
evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_DOWN,
_start_handler_mouse_down_cb, obj); _start_handler_mouse_down_cb, obj);
evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_MOVE, evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_MOVE,
@ -3414,9 +3397,9 @@ _create_selection_handlers(Evas_Object *obj, Efl_Ui_Text_Data *sd)
_start_handler_mouse_up_cb, obj); _start_handler_mouse_up_cb, obj);
evas_object_show(handle); evas_object_show(handle);
handle = edje_object_add(evas_object_evas_get(obj)); handle = _decoration_create(sd, file, "elm/entry/handler/end", EINA_TRUE);
evas_object_pass_events_set(handle, EINA_FALSE);
sd->end_handler = handle; sd->end_handler = handle;
_elm_theme_object_set(obj, handle, "entry", "handler/end", style);
evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_DOWN, evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_DOWN,
_end_handler_mouse_down_cb, obj); _end_handler_mouse_down_cb, obj);
evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_MOVE, evas_object_event_callback_add(handle, EVAS_CALLBACK_MOUSE_MOVE,
@ -3520,8 +3503,7 @@ _efl_ui_text_efl_canvas_group_group_move(Eo *obj, Efl_Ui_Text_Data *sd, Evas_Coo
if (sd->hoversel) _hoversel_position(obj); if (sd->hoversel) _hoversel_position(obj);
if (edje_object_part_text_selection_get(sd->entry_edje, "elm.text")) _update_selection_handler(obj);
_update_selection_handler(obj);
} }
EOLIAN static void EOLIAN static void
@ -3530,17 +3512,15 @@ _efl_ui_text_efl_canvas_group_group_resize(Eo *obj, Efl_Ui_Text_Data *sd, Evas_C
efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h); efl_canvas_group_resize(eo_super(obj, MY_CLASS), w, h);
evas_object_resize(sd->hit_rect, w, h); evas_object_resize(sd->hit_rect, w, h);
if (sd->have_selection) _update_selection_handler(obj);
_update_selection_handler(obj);
} }
EOLIAN static void EOLIAN static void
_efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd) _efl_ui_text_efl_canvas_group_group_show(Eo *obj, Efl_Ui_Text_Data *sd EINA_UNUSED)
{ {
efl_canvas_group_show(eo_super(obj, MY_CLASS)); efl_canvas_group_show(eo_super(obj, MY_CLASS));
if (sd->have_selection) _update_selection_handler(obj);
_update_selection_handler(obj);
} }
EOLIAN static void EOLIAN static void
@ -5075,6 +5055,9 @@ _update_text_selection(Eo *obj, Eo *text_obj)
sd->rects = eina_list_remove_list(sd->rects, l); sd->rects = eina_list_remove_list(sd->rects, l);
l = temp; l = temp;
} }
/* Update selection handlers */
_update_selection_handler(obj);
} }
static void static void