forked from enlightenment/efl
Efl.Canvas.Text rename into Efl.Canvas.Textblock
Summary: Efl.Canvas.Text renamed into **Efl.Canvas.Textblock** Efl.Canvas.Text_Factory renamed into **Efl.Canvas.Textblock_Factory** Reviewers: woohyun, segfaultxavi, zmike, bu5hm4n, YOhoho Reviewed By: segfaultxavi Subscribers: cedric, #committers, #reviewers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10808
This commit is contained in:
parent
f793939315
commit
621d2cdecf
2
NEWS
2
NEWS
|
@ -385,7 +385,7 @@ Features:
|
|||
* eo: Add "destruct" event
|
||||
* efl-wl: move to xdg-shell vfinal
|
||||
* wayland: add xdg-shell vfinal support for client-side
|
||||
* Canvas image: add Efl.Canvas.Text.Factory + use in Ui.Text
|
||||
* Canvas image: add Efl.Canvas.Textblock.Factory + use in Ui.Text
|
||||
* efl-wl: add functionality for directly passing through xkb objects
|
||||
* ecore-x: add more info to Ecore_X_Event_Xkb event
|
||||
* ecore-x: add some useful xkb function wrappers
|
||||
|
|
|
@ -491,7 +491,7 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
|
|||
|
||||
// Experimental textblock support
|
||||
o = tb = evas_object_textblock_add(evas_object_evas_get(win));
|
||||
efl_event_callback_add(o, EFL_CANVAS_TEXT_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
|
||||
efl_event_callback_add(o, EFL_CANVAS_TEXTBLOCK_EVENT_STYLE_INSETS_CHANGED, _textblock_resize, NULL);
|
||||
efl_event_callback_add(o, EFL_GFX_ENTITY_EVENT_SIZE_CHANGED, _textblock_resize, NULL);
|
||||
Evas_Textblock_Style *st = evas_textblock_style_new();
|
||||
evas_textblock_style_set(st, "DEFAULT='font=Sans font_size=20 color=#FFF wrap=word'");
|
||||
|
|
|
@ -62,10 +62,10 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
|
|||
if (!minx2)
|
||||
{
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
}
|
||||
else
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
evas_object_textblock_style_insets_get(ep->object, &ins_l,
|
||||
&ins_r, &ins_t, &ins_b);
|
||||
mw = ins_l + size.w + ins_r;
|
||||
|
@ -88,10 +88,10 @@ _edje_part_recalc_single_textblock_min_max_calc_legacy(Edje_Real_Part *ep,
|
|||
if (!maxx2)
|
||||
{
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(TO_INT(params->eval.w), TO_INT(params->eval.h)));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
}
|
||||
else
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
evas_object_textblock_style_insets_get(ep->object, &ins_l, &ins_r,
|
||||
&ins_t, &ins_b);
|
||||
mw = ins_l + size.w + ins_r;
|
||||
|
@ -180,7 +180,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
if (temp_w > 0)
|
||||
{
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -189,7 +189,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
}
|
||||
else
|
||||
{
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
th = size.h;
|
||||
|
||||
th += ins_t + ins_b;
|
||||
|
@ -221,7 +221,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
}
|
||||
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -232,7 +232,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
* don't get meaningless height for multiline */
|
||||
if (temp_w <= 0)
|
||||
{
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
th = size.h;
|
||||
|
||||
th += ins_t + ins_b;
|
||||
|
@ -246,7 +246,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
* text.min: 1 X
|
||||
* text.max: 0 X without max width.
|
||||
* It is a singleline Textblock. */
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -311,7 +311,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
if (temp_w > 0)
|
||||
{
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -320,7 +320,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
}
|
||||
else
|
||||
{
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
th = size.h;
|
||||
|
||||
th += ins_t + ins_b;
|
||||
|
@ -335,7 +335,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
/* text.min: 1 X
|
||||
* text.max: 1 X
|
||||
* Singleline. */
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -374,7 +374,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
* text.max: 1 1 */
|
||||
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -385,7 +385,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
* don't get meaningless height for multiline */
|
||||
if (temp_w <= 0)
|
||||
{
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
th = size.h;
|
||||
|
||||
th += ins_t + ins_b;
|
||||
|
@ -404,7 +404,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
|
||||
temp_h = efl_gfx_entity_size_get(ep->object).h;
|
||||
efl_gfx_entity_size_set(ep->object, EINA_SIZE2D(temp_w, temp_h));
|
||||
size = efl_canvas_text_size_formatted_get(ep->object);
|
||||
size = efl_canvas_textblock_size_formatted_get(ep->object);
|
||||
tw = size.w;
|
||||
th = size.h;
|
||||
|
||||
|
@ -415,7 +415,7 @@ _edje_part_recalc_single_textblock_min_max_calc(Edje_Real_Part *ep,
|
|||
* don't get meaningless height for multiline */
|
||||
if (temp_w <= 0)
|
||||
{
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
th = size.h;
|
||||
|
||||
th += ins_t + ins_b;
|
||||
|
@ -545,7 +545,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
|
||||
if (ep->part->scale) base_s = TO_DOUBLE(sc);
|
||||
efl_gfx_entity_scale_set(ep->object, base_s);
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
|
||||
orig_s = base_s;
|
||||
/* Now make it bigger so calculations will be more accurate
|
||||
|
@ -554,7 +554,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
orig_s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
|
||||
orig_s * TO_INT(params->eval.w) / size.w);
|
||||
efl_gfx_entity_scale_set(ep->object, orig_s);
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
}
|
||||
if (chosen_desc->text.fit_x)
|
||||
{
|
||||
|
@ -563,7 +563,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
s = _edje_part_recalc_single_textblock_scale_range_adjust(chosen_desc, base_s,
|
||||
orig_s * TO_INT(params->eval.w) / size.w);
|
||||
efl_gfx_entity_scale_set(ep->object, s);
|
||||
efl_canvas_text_size_native_get(ep->object);
|
||||
efl_canvas_textblock_size_native_get(ep->object);
|
||||
}
|
||||
}
|
||||
if (chosen_desc->text.fit_y)
|
||||
|
@ -580,7 +580,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
}
|
||||
|
||||
efl_gfx_entity_scale_set(ep->object, s);
|
||||
efl_canvas_text_size_native_get(ep->object);
|
||||
efl_canvas_textblock_size_native_get(ep->object);
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -589,7 +589,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
{
|
||||
int i = 5; /* Tries before we give up. */
|
||||
Eina_Size2D size;
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
|
||||
/* If we are still too big, try reducing the size to
|
||||
* 95% each try. */
|
||||
|
@ -605,7 +605,7 @@ _edje_part_recalc_single_textblock(FLOAT_T sc,
|
|||
s = tmp_s;
|
||||
|
||||
efl_gfx_entity_scale_set(ep->object, s);
|
||||
size = efl_canvas_text_size_native_get(ep->object);
|
||||
size = efl_canvas_textblock_size_native_get(ep->object);
|
||||
i--;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
#include "elm_priv.h"
|
||||
#include "efl_ui_internal_text_interactive.h"
|
||||
#include "efl_canvas_text_internal.h"
|
||||
#include "efl_canvas_textblock_internal.h"
|
||||
|
||||
#define MY_CLASS EFL_UI_INTERNAL_TEXT_INTERACTIVE_CLASS
|
||||
|
||||
|
@ -52,25 +52,25 @@ static const char *_entry_selection_get(Efl_Ui_Internal_Text_Interactive *obj, E
|
|||
static void _entry_imf_cursor_info_set(Efl_Ui_Internal_Text_Interactive_Data *en);
|
||||
|
||||
static void
|
||||
_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c, const char *text);
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
const char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
Eina_Bool clearsel, Eina_Bool changeinfo);
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
Eina_Bool clearsel, Eina_Bool changeinfo);
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
const char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
|
@ -109,7 +109,7 @@ _preedit_del(Eo *obj EINA_UNUSED, Efl_Ui_Internal_Text_Interactive_Data *en)
|
|||
static Eina_Bool
|
||||
_entry_imf_retrieve_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text, int *cursor_pos)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
|
||||
const char *str;
|
||||
|
||||
|
@ -144,7 +144,7 @@ _return_key_update(Evas_Object *obj)
|
|||
|
||||
if (sd->input_panel_return_key_state != EFL_INPUT_TEXT_PANEL_RETURN_KEY_STATE_AUTO) return;
|
||||
|
||||
if (efl_canvas_text_is_empty_get(obj) == EINA_TRUE)
|
||||
if (efl_canvas_textblock_is_empty_get(obj) == EINA_TRUE)
|
||||
return_key_disabled = EINA_TRUE;
|
||||
|
||||
if (sd->imf_context)
|
||||
|
@ -180,7 +180,7 @@ _entry_hide_visible_password(Eo *obj)
|
|||
static void
|
||||
_entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
|
||||
char *commit_str = event_info;
|
||||
Efl_Text_Change_Info *info = NULL;
|
||||
|
@ -231,7 +231,7 @@ _entry_imf_event_commit_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void
|
|||
}
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_markup_prepend_internal(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
|
@ -284,7 +284,7 @@ _text_filter_markup_prepend_internal(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_
|
|||
}
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_markup_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
const char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
|
@ -313,7 +313,7 @@ _text_filter_markup_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti
|
|||
}
|
||||
|
||||
static Efl_Text_Change_Info *
|
||||
_text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_text_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c,
|
||||
const char *text,
|
||||
const char *fmtpre, const char *fmtpost,
|
||||
|
@ -342,7 +342,7 @@ _text_filter_text_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive
|
|||
}
|
||||
|
||||
static void
|
||||
_text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
_text_filter_format_prepend(Efl_Canvas_Textblock *obj, Efl_Ui_Internal_Text_Interactive_Data *en,
|
||||
Efl_Text_Cursor *c, const char *text)
|
||||
{
|
||||
EINA_SAFETY_ON_NULL_RETURN(text);
|
||||
|
@ -416,7 +416,7 @@ _text_filter_format_prepend(Efl_Canvas_Text *obj, Efl_Ui_Internal_Text_Interacti
|
|||
static void
|
||||
_entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info EINA_UNUSED)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
|
||||
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
|
||||
Efl_Text_Change_Info *info = NULL;
|
||||
|
@ -518,12 +518,12 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
|
|||
{
|
||||
/* set preedit start cursor */
|
||||
if (!en->preedit_start)
|
||||
en->preedit_start = efl_canvas_text_cursor_create(obj);
|
||||
en->preedit_start = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, en->preedit_start);
|
||||
|
||||
/* set preedit end cursor */
|
||||
if (!en->preedit_end)
|
||||
en->preedit_end = efl_canvas_text_cursor_create(obj);
|
||||
en->preedit_end = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, en->preedit_end);
|
||||
|
||||
preedit_end_pos = efl_text_cursor_position_get(cur);
|
||||
|
@ -561,7 +561,7 @@ _entry_imf_event_preedit_changed_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUS
|
|||
static void
|
||||
_entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
|
||||
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
|
||||
Ecore_IMF_Event_Delete_Surrounding *ev = event_info;
|
||||
|
@ -573,10 +573,10 @@ _entry_imf_event_delete_surrounding_cb(void *data, Ecore_IMF_Context *ctx EINA_U
|
|||
|
||||
cursor_pos = efl_text_cursor_position_get(cur);
|
||||
|
||||
del_start = efl_canvas_text_cursor_create(obj);
|
||||
del_start = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_position_set(del_start, cursor_pos + ev->offset);
|
||||
|
||||
del_end = efl_canvas_text_cursor_create(obj);
|
||||
del_end = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_position_set(del_end, cursor_pos + ev->offset + ev->n_chars);
|
||||
|
||||
start = efl_text_cursor_position_get(del_start);
|
||||
|
@ -605,7 +605,7 @@ end:
|
|||
static void
|
||||
_entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, void *event_info)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Text_Cursor *cur = efl_text_interactive_main_cursor_get(obj);
|
||||
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
|
||||
Ecore_IMF_Event_Selection *ev = event_info;
|
||||
|
@ -628,7 +628,7 @@ _entry_imf_event_selection_set_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED
|
|||
static Eina_Bool
|
||||
_entry_imf_retrieve_selection_cb(void *data, Ecore_IMF_Context *ctx EINA_UNUSED, char **text)
|
||||
{
|
||||
Efl_Canvas_Text *obj = data;
|
||||
Efl_Canvas_Textblock *obj = data;
|
||||
Efl_Ui_Internal_Text_Interactive_Data *en = efl_data_scope_get(obj, MY_CLASS);
|
||||
const char *selection_text = NULL;
|
||||
|
||||
|
@ -1106,7 +1106,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
|
|||
{
|
||||
if (multiline)
|
||||
{
|
||||
if (shift || efl_canvas_text_newline_as_paragraph_separator_get(obj))
|
||||
if (shift || efl_canvas_textblock_newline_as_paragraph_separator_get(obj))
|
||||
{
|
||||
string = "\n";
|
||||
}
|
||||
|
@ -1193,7 +1193,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
|
|||
if (control && !en->have_selection)
|
||||
{
|
||||
// del to start of previous word
|
||||
Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj);
|
||||
Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
|
||||
|
||||
efl_text_cursor_copy(tc, cur);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_CHAR_PREV);
|
||||
|
@ -1228,7 +1228,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
|
|||
if (control)
|
||||
{
|
||||
// del to end of next word
|
||||
Efl_Text_Cursor *tc = efl_canvas_text_cursor_create(obj);
|
||||
Efl_Text_Cursor *tc = efl_canvas_textblock_cursor_create(obj);
|
||||
|
||||
efl_text_cursor_copy(tc, cur);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_END);
|
||||
|
@ -1466,20 +1466,20 @@ end:
|
|||
}
|
||||
|
||||
static void
|
||||
_cursor_char_coord_set(Efl_Canvas_Text *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
|
||||
_cursor_char_coord_set(Efl_Canvas_Textblock *obj, Efl_Text_Cursor *cur, Evas_Coord canvasx, Evas_Coord canvasy, Evas_Coord *_cx, Evas_Coord *_cy)
|
||||
{
|
||||
Evas_Coord cx, cy;
|
||||
Evas_Coord x, y, lh = 0, cly = 0;
|
||||
Efl_Text_Cursor *line_cur;
|
||||
Efl_Text_Cursor *tc;
|
||||
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
evas_object_geometry_get(obj, &x, &y, NULL, NULL);
|
||||
cx = canvasx - x;
|
||||
cy = canvasy - y;
|
||||
|
||||
line_cur = efl_canvas_text_cursor_create(obj);
|
||||
line_cur = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_move(line_cur, EFL_TEXT_CURSOR_MOVE_TYPE_LAST);
|
||||
evas_textblock_cursor_line_geometry_get(efl_text_cursor_handle_get(line_cur), NULL, &cly, NULL, &lh);
|
||||
/* Consider a threshold of half the line height */
|
||||
|
@ -1538,7 +1538,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
{
|
||||
if (shift)
|
||||
{
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
if (efl_text_cursor_compare(cur, en->sel_start) < 0)
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
|
||||
|
@ -1551,7 +1551,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
en->have_selection = EINA_FALSE;
|
||||
en->selecting = EINA_FALSE;
|
||||
_sel_clear(obj, en);
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_LINE_START);
|
||||
_sel_init(cur, obj, en);
|
||||
|
@ -1564,7 +1564,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
{
|
||||
if (shift)
|
||||
{
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
if (efl_text_cursor_compare(cur, en->sel_start) < 0)
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
|
||||
|
@ -1580,7 +1580,7 @@ _mouse_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj EIN
|
|||
en->have_selection = EINA_FALSE;
|
||||
en->selecting = EINA_FALSE;
|
||||
_sel_clear(obj, en);
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
efl_text_cursor_move(cur, EFL_TEXT_CURSOR_MOVE_TYPE_WORD_START);
|
||||
_sel_init(cur, obj, en);
|
||||
|
@ -1679,7 +1679,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
|
|||
|
||||
if (en->selecting)
|
||||
{
|
||||
tc = efl_canvas_text_cursor_create(obj);
|
||||
tc = efl_canvas_textblock_cursor_create(obj);
|
||||
efl_text_cursor_copy(cur, tc);
|
||||
evas_object_geometry_get(obj, &x, &y, &w, &h);
|
||||
cx = ev->cur.canvas.x - x;
|
||||
|
@ -1733,9 +1733,9 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
|
|||
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_UP, _mouse_up_cb, NULL);
|
||||
evas_object_event_callback_add(obj, EVAS_CALLBACK_MOUSE_MOVE, _mouse_move_cb, NULL);
|
||||
|
||||
en->main_cursor = efl_canvas_text_cursor_create(obj);
|
||||
en->sel_start = efl_canvas_text_cursor_create(obj);
|
||||
en->sel_end = efl_canvas_text_cursor_create(obj);
|
||||
en->main_cursor = efl_canvas_textblock_cursor_create(obj);
|
||||
en->sel_start = efl_canvas_textblock_cursor_create(obj);
|
||||
en->sel_end = efl_canvas_textblock_cursor_create(obj);
|
||||
|
||||
efl_event_callback_add(efl_text_interactive_main_cursor_get(obj), EFL_TEXT_CURSOR_EVENT_CHANGED,
|
||||
_sel_cursor_changed, obj);
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Text implements Efl.Text_Interactive, Efl.Input_Text
|
||||
class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implements Efl.Text_Interactive, Efl.Input_Text
|
||||
{
|
||||
[[An internal object in charge of the interactive aspect of the text widget.
|
||||
|
||||
|
|
|
@ -36,7 +36,7 @@
|
|||
|
||||
typedef struct _Efl_Ui_Internal_Text_Scroller_Data
|
||||
{
|
||||
Efl_Canvas_Text *text_obj;
|
||||
Efl_Canvas_Textblock *text_obj;
|
||||
Efl_Ui_Table *text_table;
|
||||
Eo *smanager;
|
||||
|
||||
|
@ -101,7 +101,7 @@ _efl_ui_internal_text_scroller_efl_canvas_group_group_calculate(Eo *obj,
|
|||
efl_event_freeze(sd->text_obj);
|
||||
efl_gfx_entity_size_set(sd->text_table, view.size);
|
||||
efl_gfx_entity_size_set(sd->text_obj, view.size);
|
||||
fsz = efl_canvas_text_size_formatted_get(sd->text_obj);
|
||||
fsz = efl_canvas_textblock_size_formatted_get(sd->text_obj);
|
||||
efl_gfx_entity_size_set(sd->text_table, sz);
|
||||
efl_gfx_entity_size_set(sd->text_obj, sz);
|
||||
efl_event_thaw(sd->text_obj);
|
||||
|
@ -152,7 +152,7 @@ _efl_ui_internal_text_scroller_efl_object_destructor(Eo *obj,
|
|||
EOLIAN static void
|
||||
_efl_ui_internal_text_scroller_initialize(Eo *obj,
|
||||
Efl_Ui_Internal_Text_Scroller_Data *sd,
|
||||
Efl_Canvas_Text *text_obj,
|
||||
Efl_Canvas_Textblock *text_obj,
|
||||
Efl_Ui_Table *text_table)
|
||||
{
|
||||
if (efl_finalized_get(obj))
|
||||
|
|
|
@ -10,7 +10,7 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
|
|||
[[Internal-usage text scroller class.
|
||||
|
||||
This class is a special scroller that evaluates its size based on the
|
||||
@Efl.Canvas.Text object it holds. On initialization the object is meant
|
||||
@Efl.Canvas.Textblock object it holds. On initialization the object is meant
|
||||
to be passed along a container (so that other objects such as
|
||||
a "guide hint" text object are store in such container.
|
||||
]]
|
||||
|
@ -32,11 +32,11 @@ class @beta Efl.Ui.Internal_Text_Scroller extends Efl.Ui.Scroller
|
|||
}
|
||||
}
|
||||
initialize {
|
||||
[[The Efl.Canvas.Text content of this scroller.
|
||||
[[The Efl.Canvas.Textblock content of this scroller.
|
||||
This should be called upon constructing the object.
|
||||
]]
|
||||
params {
|
||||
text_obj: Efl.Canvas.Text; [[The text object to query]]
|
||||
text_obj: Efl.Canvas.Textblock; [[The text object to query]]
|
||||
text_table: Efl.Ui.Table; [[The table container of
|
||||
the $text_obj]]
|
||||
}
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
#include "elm_hoversel_eo.h"
|
||||
#include "efl_ui_text_part.eo.h"
|
||||
#include "elm_part_helper.h"
|
||||
#include "efl_canvas_text_internal.h"
|
||||
#include "efl_canvas_textblock_internal.h"
|
||||
|
||||
typedef struct _Efl_Ui_Text_Data Efl_Ui_Text_Data;
|
||||
typedef struct _Efl_Ui_Text_Rectangle Efl_Ui_Text_Rectangle;
|
||||
|
@ -65,8 +65,8 @@ struct _Efl_Ui_Text_Data
|
|||
int gen;
|
||||
Eina_List *sel;
|
||||
Eina_List *items; /** context menu item list */
|
||||
Efl_Canvas_Text_Factory *item_factory;
|
||||
Efl_Canvas_Text_Factory *item_fallback_factory;
|
||||
Efl_Canvas_Textblock_Factory *item_factory;
|
||||
Efl_Canvas_Textblock_Factory *item_fallback_factory;
|
||||
Eina_List *markup_filters;
|
||||
Ecore_Job *hov_deljob;
|
||||
Mod_Api *api; // module api if supplied
|
||||
|
@ -851,9 +851,9 @@ _efl_ui_text_efl_canvas_group_group_calculate(Eo *obj, Efl_Ui_Text_Data *sd)
|
|||
efl_gfx_entity_size_set(sd->text_obj, EINA_SIZE2D(sz.w, 0));
|
||||
/* ignore current object size for single-line since we always need to know the actual size */
|
||||
if (!efl_text_multiline_get(obj))
|
||||
min = efl_canvas_text_size_native_get(sd->text_obj);
|
||||
min = efl_canvas_textblock_size_native_get(sd->text_obj);
|
||||
else
|
||||
min = efl_canvas_text_size_formatted_get(sd->text_obj);
|
||||
min = efl_canvas_textblock_size_formatted_get(sd->text_obj);
|
||||
efl_gfx_entity_size_set(sd->text_obj, text_sz);
|
||||
efl_event_thaw(sd->text_obj);
|
||||
min.w += edmin.w;
|
||||
|
@ -1485,11 +1485,11 @@ _item_get(void *data, const char *item)
|
|||
{
|
||||
if (sd->item_factory)
|
||||
{
|
||||
o = efl_canvas_text_factory_create(sd->item_factory, data, item);
|
||||
o = efl_canvas_textblock_factory_create(sd->item_factory, data, item);
|
||||
}
|
||||
else if (sd->item_fallback_factory)
|
||||
{
|
||||
o = efl_canvas_text_factory_create(sd->item_fallback_factory,
|
||||
o = efl_canvas_textblock_factory_create(sd->item_fallback_factory,
|
||||
data, item);
|
||||
}
|
||||
}
|
||||
|
@ -1967,7 +1967,7 @@ _efl_ui_text_efl_object_constructor(Eo *obj, Efl_Ui_Text_Data *sd)
|
|||
efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_UNDO_REQUEST, obj);
|
||||
efl_event_callback_forwarder_add(text_obj, EFL_TEXT_INTERACTIVE_EVENT_PREEDIT_CHANGED, obj);
|
||||
sd->text_obj = text_obj;
|
||||
sd->text_guide_obj = efl_add(EFL_CANVAS_TEXT_CLASS, obj);
|
||||
sd->text_guide_obj = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, obj);
|
||||
sd->text_table = efl_add(EFL_UI_TABLE_CLASS, obj);
|
||||
efl_composite_attach(obj, text_obj);
|
||||
|
||||
|
@ -2028,7 +2028,7 @@ _efl_ui_text_efl_object_finalize(Eo *obj,
|
|||
(sd->entry_edje, EVAS_HINT_FILL, EVAS_HINT_FILL);
|
||||
efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_CHANGED_USER,
|
||||
_efl_ui_text_changed_user_cb, obj);
|
||||
efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXT_EVENT_CHANGED,
|
||||
efl_event_callback_add(sd->text_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED,
|
||||
_efl_ui_text_changed_cb, obj);
|
||||
efl_event_callback_add(sd->text_obj, EFL_TEXT_INTERACTIVE_EVENT_HAVE_SELECTION_CHANGED,
|
||||
_efl_ui_text_selection_start_clear_cb, obj);
|
||||
|
@ -3337,8 +3337,8 @@ _anchors_update(Eo *obj, Efl_Ui_Text_Data *sd)
|
|||
|
||||
sd->gen++;
|
||||
|
||||
start = efl_canvas_text_cursor_create(sd->text_obj);
|
||||
end = efl_canvas_text_cursor_create(sd->text_obj);
|
||||
start = efl_canvas_textblock_cursor_create(sd->text_obj);
|
||||
end = efl_canvas_textblock_cursor_create(sd->text_obj);
|
||||
|
||||
/* Retrieve all annotations in the text. */
|
||||
efl_text_cursor_move(start, EFL_TEXT_CURSOR_MOVE_TYPE_FIRST);
|
||||
|
@ -3645,7 +3645,7 @@ _efl_ui_text_move_cb(void *data, Evas *e EINA_UNUSED,
|
|||
|
||||
static void
|
||||
_efl_ui_text_item_factory_set(Eo *obj EINA_UNUSED, Efl_Ui_Text_Data *pd,
|
||||
Efl_Canvas_Text_Factory *item_factory)
|
||||
Efl_Canvas_Textblock_Factory *item_factory)
|
||||
{
|
||||
if (pd->item_factory) efl_unref(pd->item_factory);
|
||||
pd->item_factory = efl_ref(item_factory);
|
||||
|
|
|
@ -61,7 +61,7 @@ class @beta Efl.Ui.Text extends Efl.Ui.Layout_Base implements Efl.Input.Clickabl
|
|||
"emoticon/happy" or "href=file://image.jpg" etc.
|
||||
]]
|
||||
values {
|
||||
item_factory: Efl.Canvas.Text_Factory; [[Factory to create items]]
|
||||
item_factory: Efl.Canvas.Textblock_Factory; [[Factory to create items]]
|
||||
}
|
||||
}
|
||||
cursor_add {
|
||||
|
|
|
@ -15,7 +15,7 @@ struct _Efl_Ui_Text_Factory_Emoticons_Data
|
|||
};
|
||||
|
||||
EOLIAN static Efl_Canvas_Object
|
||||
*_efl_ui_text_factory_emoticons_efl_canvas_text_factory_create(
|
||||
*_efl_ui_text_factory_emoticons_efl_canvas_textblock_factory_create(
|
||||
Eo *obj EINA_UNUSED,
|
||||
Efl_Ui_Text_Factory_Emoticons_Data *pd EINA_UNUSED,
|
||||
Efl_Canvas_Object *object,
|
||||
|
|
|
@ -1,8 +1,8 @@
|
|||
class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Text_Factory
|
||||
class @beta Efl.Ui.Text_Factory.Emoticons extends Efl.Object implements Efl.Canvas.Textblock_Factory
|
||||
{
|
||||
[[Factory that creates emoticons from the current theme given a key.
|
||||
]]
|
||||
implements {
|
||||
Efl.Canvas.Text_Factory.create;
|
||||
Efl.Canvas.Textblock_Factory.create;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -12,7 +12,7 @@ typedef struct _Efl_Ui_Text_Factory_Fallback_Data Efl_Ui_Text_Factory_Fallback_D
|
|||
|
||||
struct _Efl_Ui_Text_Factory_Fallback_Data
|
||||
{
|
||||
Efl_Canvas_Text_Factory *emoticon_factory, *image_factory;
|
||||
Efl_Canvas_Textblock_Factory *emoticon_factory, *image_factory;
|
||||
};
|
||||
|
||||
EOLIAN static Eo *
|
||||
|
@ -34,7 +34,7 @@ _efl_ui_text_factory_fallback_efl_object_destructor(Eo *obj,
|
|||
|
||||
|
||||
EOLIAN static Efl_Canvas_Object
|
||||
*_efl_ui_text_factory_fallback_efl_canvas_text_factory_create(
|
||||
*_efl_ui_text_factory_fallback_efl_canvas_textblock_factory_create(
|
||||
Eo *obj EINA_UNUSED,
|
||||
Efl_Ui_Text_Factory_Fallback_Data *pd EINA_UNUSED,
|
||||
Efl_Canvas_Object *object,
|
||||
|
@ -48,11 +48,11 @@ EOLIAN static Efl_Canvas_Object
|
|||
if (key && !strncmp(key, "file://", 7))
|
||||
{
|
||||
const char *fname = key + 7;
|
||||
o = efl_canvas_text_factory_create(pd->image_factory, object, fname);
|
||||
o = efl_canvas_textblock_factory_create(pd->image_factory, object, fname);
|
||||
}
|
||||
else
|
||||
{
|
||||
o = efl_canvas_text_factory_create(pd->emoticon_factory, object, key);
|
||||
o = efl_canvas_textblock_factory_create(pd->emoticon_factory, object, key);
|
||||
}
|
||||
return o;
|
||||
}
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Text_Factory
|
||||
class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canvas.Textblock_Factory
|
||||
{
|
||||
[[Internal factory for fallback cases.
|
||||
|
||||
|
@ -10,6 +10,6 @@ class @beta Efl.Ui.Text_Factory.Fallback extends Efl.Object implements Efl.Canva
|
|||
implements {
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
Efl.Canvas.Text_Factory.create;
|
||||
Efl.Canvas.Textblock_Factory.create;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -49,7 +49,7 @@ _efl_ui_text_factory_images_efl_object_destructor(Eo *obj,
|
|||
}
|
||||
|
||||
EOLIAN static Efl_Canvas_Object *
|
||||
_efl_ui_text_factory_images_efl_canvas_text_factory_create(Eo *obj EINA_UNUSED,
|
||||
_efl_ui_text_factory_images_efl_canvas_textblock_factory_create(Eo *obj EINA_UNUSED,
|
||||
Efl_Ui_Text_Factory_Images_Data *pd EINA_UNUSED,
|
||||
Efl_Canvas_Object *object,
|
||||
const char *key)
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Text_Factory
|
||||
class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.Textblock_Factory
|
||||
{
|
||||
[[Factory that creates images given key string
|
||||
|
||||
|
@ -62,6 +62,6 @@ class @beta Efl.Ui.Text_Factory.Images extends Efl.Object implements Efl.Canvas.
|
|||
implements {
|
||||
Efl.Object.constructor;
|
||||
Efl.Object.destructor;
|
||||
Efl.Canvas.Text_Factory.create;
|
||||
Efl.Canvas.Textblock_Factory.create;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -85,8 +85,8 @@ extern "C" {
|
|||
#include <canvas/efl_canvas_snapshot.eo.h>
|
||||
#include <canvas/efl_text_cursor.eo.h>
|
||||
#include <canvas/efl_text_attribute_factory.eo.h>
|
||||
#include <canvas/efl_canvas_text.eo.h>
|
||||
#include <canvas/efl_canvas_text_factory.eo.h>
|
||||
#include <canvas/efl_canvas_textblock.eo.h>
|
||||
#include <canvas/efl_canvas_textblock_factory.eo.h>
|
||||
#include <canvas/efl_canvas_vg_node.eo.h>
|
||||
#include <canvas/efl_canvas_vg_container.eo.h>
|
||||
#include <canvas/efl_canvas_vg_gradient.eo.h>
|
||||
|
|
|
@ -143,14 +143,14 @@ struct _Efl_Canvas_Object_Animation_Event
|
|||
*/
|
||||
|
||||
/**
|
||||
* @ingroup Efl_Canvas_Text
|
||||
* @ingroup Efl_Canvas_Textblock
|
||||
*
|
||||
* @{
|
||||
*/
|
||||
#include "canvas/efl_text_cursor.eo.h"
|
||||
#include "canvas/efl_text_attribute_factory.eo.h"
|
||||
#include "canvas/efl_canvas_text.eo.h"
|
||||
#include "canvas/efl_canvas_text_factory.eo.h"
|
||||
#include "canvas/efl_canvas_textblock.eo.h"
|
||||
#include "canvas/efl_canvas_textblock_factory.eo.h"
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
@ -1,72 +0,0 @@
|
|||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end)
|
||||
{
|
||||
return evas_textblock_cursor_visible_range_get(start, end);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *l, int *r, int *t, int *b)
|
||||
{
|
||||
efl_canvas_text_style_insets_get(obj, l, r, t, b);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim)
|
||||
{
|
||||
efl_canvas_text_bidi_delimiters_set(obj, delim);
|
||||
}
|
||||
|
||||
EAPI const char *
|
||||
evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj)
|
||||
{
|
||||
return efl_canvas_text_bidi_delimiters_get(obj);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode)
|
||||
{
|
||||
efl_canvas_text_newline_as_paragraph_separator_set(obj, mode);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj)
|
||||
{
|
||||
return efl_canvas_text_newline_as_paragraph_separator_get(obj);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *w, int *h)
|
||||
{
|
||||
Eina_Size2D size;
|
||||
size = efl_canvas_text_size_formatted_get(obj);
|
||||
if (w) *w = size.w;
|
||||
if (h) *h = size.h;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *w, int *h)
|
||||
{
|
||||
Eina_Size2D size;
|
||||
size = efl_canvas_text_size_native_get(obj);
|
||||
if (w) *w = size.w;
|
||||
if (h) *h = size.h;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs)
|
||||
{
|
||||
return efl_canvas_text_obstacle_add(obj, eo_obs);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs)
|
||||
{
|
||||
return efl_canvas_text_obstacle_del(obj, eo_obs);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj)
|
||||
{
|
||||
efl_canvas_text_obstacles_update(obj);
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
import efl_text_types;
|
||||
|
||||
class @beta Efl.Canvas.Text extends Efl.Canvas.Object implements Efl.Text,
|
||||
class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
|
||||
Efl.Canvas.Filter.Internal, Efl.Text_Font,
|
||||
Efl.Text_Style, Efl.Text_Format,
|
||||
Efl.Text_Markup, Efl.Ui.I18n
|
|
@ -0,0 +1,72 @@
|
|||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj EINA_UNUSED, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end)
|
||||
{
|
||||
return evas_textblock_cursor_visible_range_get(start, end);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *l, int *r, int *t, int *b)
|
||||
{
|
||||
efl_canvas_textblock_style_insets_get(obj, l, r, t, b);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim)
|
||||
{
|
||||
efl_canvas_textblock_bidi_delimiters_set(obj, delim);
|
||||
}
|
||||
|
||||
EAPI const char *
|
||||
evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj)
|
||||
{
|
||||
return efl_canvas_textblock_bidi_delimiters_get(obj);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode)
|
||||
{
|
||||
efl_canvas_textblock_newline_as_paragraph_separator_set(obj, mode);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj)
|
||||
{
|
||||
return efl_canvas_textblock_newline_as_paragraph_separator_get(obj);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
|
||||
{
|
||||
Eina_Size2D size;
|
||||
size = efl_canvas_textblock_size_formatted_get(obj);
|
||||
if (w) *w = size.w;
|
||||
if (h) *h = size.h;
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *w, int *h)
|
||||
{
|
||||
Eina_Size2D size;
|
||||
size = efl_canvas_textblock_size_native_get(obj);
|
||||
if (w) *w = size.w;
|
||||
if (h) *h = size.h;
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
|
||||
{
|
||||
return efl_canvas_textblock_obstacle_add(obj, eo_obs);
|
||||
}
|
||||
|
||||
EAPI Eina_Bool
|
||||
evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs)
|
||||
{
|
||||
return efl_canvas_textblock_obstacle_del(obj, eo_obs);
|
||||
}
|
||||
|
||||
EAPI void
|
||||
evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj)
|
||||
{
|
||||
efl_canvas_textblock_obstacles_update(obj);
|
||||
}
|
|
@ -1,15 +1,15 @@
|
|||
#ifndef _EFL_CANVAS_TEXT_EO_LEGACY_H_
|
||||
#define _EFL_CANVAS_TEXT_EO_LEGACY_H_
|
||||
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
|
||||
#define _EFL_CANVAS_TEXTBLOCK_EO_LEGACY_H_
|
||||
|
||||
#ifndef _EFL_CANVAS_TEXT_EO_CLASS_TYPE
|
||||
#define _EFL_CANVAS_TEXT_EO_CLASS_TYPE
|
||||
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
|
||||
#define _EFL_CANVAS_TEXTBLOCK_EO_CLASS_TYPE
|
||||
|
||||
typedef Eo Efl_Canvas_Text;
|
||||
typedef Eo Efl_Canvas_Textblock;
|
||||
|
||||
#endif
|
||||
|
||||
#ifndef _EFL_CANVAS_TEXT_EO_TYPES
|
||||
#define _EFL_CANVAS_TEXT_EO_TYPES
|
||||
#ifndef _EFL_CANVAS_TEXTBLOCK_EO_TYPES
|
||||
#define _EFL_CANVAS_TEXTBLOCK_EO_TYPES
|
||||
|
||||
|
||||
#endif
|
||||
|
@ -32,7 +32,7 @@ typedef Eo Efl_Canvas_Text;
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end);
|
||||
EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Textblock *obj, Efl_Text_Cursor_Handle *start, Efl_Text_Cursor_Handle *end);
|
||||
|
||||
/**
|
||||
* @brief Gets the left, right, top and bottom insets of the text.
|
||||
|
@ -49,7 +49,7 @@ EAPI Eina_Bool evas_object_textblock_visible_range_get(Efl_Canvas_Text *obj, Efl
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int *left, int *right, int *top, int *bottom);
|
||||
EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Textblock *obj, int *left, int *right, int *top, int *bottom);
|
||||
|
||||
/**
|
||||
* @brief BiDi delimiters are used for in-paragraph separation of bidi
|
||||
|
@ -64,7 +64,7 @@ EAPI void evas_object_textblock_style_insets_get(const Efl_Canvas_Text *obj, int
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const char *delim);
|
||||
EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Textblock *obj, const char *delim);
|
||||
|
||||
/**
|
||||
* @brief BiDi delimiters are used for in-paragraph separation of bidi
|
||||
|
@ -79,7 +79,7 @@ EAPI void evas_object_textblock_bidi_delimiters_set(Efl_Canvas_Text *obj, const
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text *obj);
|
||||
EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Textblock *obj);
|
||||
|
||||
/**
|
||||
* @brief When @c true, newline character will behave as a paragraph separator.
|
||||
|
@ -91,7 +91,7 @@ EAPI const char *evas_object_textblock_bidi_delimiters_get(const Efl_Canvas_Text
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bool mode);
|
||||
EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Textblock *obj, Eina_Bool mode);
|
||||
|
||||
/**
|
||||
* @brief When @c true, newline character will behave as a paragraph separator.
|
||||
|
@ -104,7 +104,7 @@ EAPI void evas_object_textblock_legacy_newline_set(Efl_Canvas_Text *obj, Eina_Bo
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *obj);
|
||||
EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Textblock *obj);
|
||||
|
||||
|
||||
|
||||
|
@ -133,7 +133,7 @@ EAPI Eina_Bool evas_object_textblock_legacy_newline_get(const Efl_Canvas_Text *o
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, int *width, int *height);
|
||||
EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
|
||||
|
||||
/**
|
||||
* @brief The native width and height.
|
||||
|
@ -161,7 +161,7 @@ EAPI void evas_object_textblock_size_formatted_get(const Efl_Canvas_Text *obj, i
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int *width, int *height);
|
||||
EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Textblock *obj, int *width, int *height);
|
||||
|
||||
|
||||
|
||||
|
@ -183,7 +183,7 @@ EAPI void evas_object_textblock_size_native_get(const Efl_Canvas_Text *obj, int
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs);
|
||||
EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
|
||||
|
||||
/**
|
||||
* @brief Removes @c eo_obs from observation during text layout.
|
||||
|
@ -197,7 +197,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_add(Efl_Canvas_Text *obj, Efl_Canv
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canvas_Object *eo_obs);
|
||||
EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Textblock *obj, Efl_Canvas_Object *eo_obs);
|
||||
|
||||
/**
|
||||
* @brief Triggers for relayout due to obstacles' state change.
|
||||
|
@ -216,7 +216,7 @@ EAPI Eina_Bool evas_object_textblock_obstacle_del(Efl_Canvas_Text *obj, Efl_Canv
|
|||
*
|
||||
* @ingroup Evas_Object_Textblock_Group
|
||||
*/
|
||||
EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Text *obj);
|
||||
EAPI void evas_object_textblock_obstacles_update(Efl_Canvas_Textblock *obj);
|
||||
|
||||
|
||||
#endif
|
|
@ -1,4 +1,4 @@
|
|||
interface @beta Efl.Canvas.Text_Factory
|
||||
interface @beta Efl.Canvas.Textblock_Factory
|
||||
{
|
||||
[[Object factory that creates Efl.Canvas.Object objects.
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
#ifndef _EFL_CANVAS_TEXT_INTERNAL_H
|
||||
#define _EFL_CANVAS_TEXT_INTERNAL_H
|
||||
#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
|
||||
#define _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
|
||||
|
||||
#include <Evas.h>
|
||||
|
||||
|
@ -11,10 +11,10 @@
|
|||
/* private struct for textblock object internal data */
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Efl_Canvas_Text_Data
|
||||
* @typedef Efl_Canvas_Textblock_Data
|
||||
* The actual textblock object.
|
||||
*/
|
||||
typedef struct _Evas_Object_Textblock Efl_Canvas_Text_Data;
|
||||
typedef struct _Evas_Object_Textblock Efl_Canvas_Textblock_Data;
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Evas_Object_Style_Tag
|
||||
|
@ -89,22 +89,22 @@ typedef struct _Evas_Textblock_Selection_Iterator Evas_Textblock_Selection_Itera
|
|||
typedef struct _Efl_Text_Attribute_Handle_Iterator Efl_Text_Attribute_Handle_Iterator;
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Efl_Canvas_Text_Filter
|
||||
* @typedef Efl_Canvas_Textblock_Filter
|
||||
* A structure holding gfx filter information for a text item
|
||||
*/
|
||||
typedef struct _Efl_Canvas_Text_Filter Efl_Canvas_Text_Filter;
|
||||
typedef struct _Efl_Canvas_Textblock_Filter Efl_Canvas_Textblock_Filter;
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Efl_Canvas_Text_Filter_Post_Render
|
||||
* @typedef Efl_Canvas_Textblock_Filter_Post_Render
|
||||
* Post-render data for async rendering of gfx filters
|
||||
*/
|
||||
typedef struct _Efl_Canvas_Text_Filter_Post_Render Efl_Canvas_Text_Filter_Post_Render;
|
||||
typedef struct _Efl_Canvas_Textblock_Filter_Post_Render Efl_Canvas_Textblock_Filter_Post_Render;
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Efl_Canvas_Text_Filter_Program
|
||||
* @typedef Efl_Canvas_Textblock_Filter_Program
|
||||
* Filter name - code database
|
||||
*/
|
||||
typedef struct _Efl_Canvas_Text_Filter_Program Efl_Canvas_Text_Filter_Program;
|
||||
typedef struct _Efl_Canvas_Textblock_Filter_Program Efl_Canvas_Textblock_Filter_Program;
|
||||
/**
|
||||
* @internal
|
||||
* @typedef Text_Item_Filter
|
||||
|
@ -235,7 +235,7 @@ _evas_textblock_annotations_set(Evas_Object *eo_obj,
|
|||
const char *format, Eina_Bool is_item);
|
||||
|
||||
void
|
||||
_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Text_Data *o,
|
||||
_evas_textblock_annotation_remove(Evas_Object *eo_obj, Efl_Canvas_Textblock_Data *o,
|
||||
Efl_Text_Attribute_Handle *an, Eina_Bool remove_nodes, Eina_Bool invalidate);
|
||||
|
||||
void
|
||||
|
@ -312,4 +312,4 @@ EAPI Efl_Text_Cursor_Handle *efl_text_cursor_handle_get(const Eo *obj);
|
|||
#undef EAPI
|
||||
#define EAPI
|
||||
|
||||
#endif//#ifndef _EFL_CANVAS_TEXT_INTERNAL_H
|
||||
#endif//#ifndef _EFL_CANVAS_TEXTBLOCK_INTERNAL_H
|
|
@ -1,7 +1,7 @@
|
|||
//#define EFL_BETA_API_SUPPORT
|
||||
#include "evas_common_private.h"
|
||||
#include "evas_private.h"
|
||||
#include "efl_canvas_text_internal.h"
|
||||
#include "efl_canvas_textblock_internal.h"
|
||||
#include "efl_text_cursor.eo.h"
|
||||
|
||||
#define MY_CLASS EFL_TEXT_ATTRIBUTE_FACTORY_CLASS
|
||||
|
@ -23,7 +23,7 @@ _efl_text_attribute_factory_attribute_insert(const Efl_Text_Cursor *start, const
|
|||
|
||||
_evas_textblock_annotations_insert(eo_obj, efl_text_cursor_handle_get(start), efl_text_cursor_handle_get(end), format,
|
||||
EINA_FALSE);
|
||||
efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXT_EVENT_CHANGED, NULL);
|
||||
efl_event_callback_legacy_call(eo_obj, EFL_CANVAS_TEXTBLOCK_EVENT_CHANGED, NULL);
|
||||
}
|
||||
|
||||
EOLIAN static unsigned int
|
||||
|
|
|
@ -6,7 +6,7 @@ abstract @beta Efl.Text.Attribute.Factory extends Efl.Object {
|
|||
|
||||
Attributes can be assigned to character ranges, selected using two @Efl.Text.Cursor instances.
|
||||
Cursor instances are already bound to a text object so there's no need to provide it to this class.
|
||||
Style is specified using format strings as described in @Efl.Canvas.Text.style_apply.
|
||||
Style is specified using format strings as described in @Efl.Canvas.Textblock.style_apply.
|
||||
|
||||
There is no need to instantiate this class. Use directly the @.attribute_insert and @.attribute_clear static methods.]]
|
||||
methods {
|
||||
|
@ -15,7 +15,7 @@ abstract @beta Efl.Text.Attribute.Factory extends Efl.Object {
|
|||
|
||||
The $format will be applied to the given range.
|
||||
The passed cursors must belong to same textObject, else insertion will be ignored.
|
||||
Passed format parameter uses same format as style in @Efl.Canvas.Text.style_apply.
|
||||
Passed format parameter uses same format as style in @Efl.Canvas.Textblock.style_apply.
|
||||
]]
|
||||
params {
|
||||
start: const(Efl.Text.Cursor); [[Start of range.]]
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
#include "evas_common_private.h"
|
||||
#include "evas_private.h"
|
||||
#include "efl_canvas_text_internal.h"
|
||||
#include "efl_canvas_textblock_internal.h"
|
||||
|
||||
#define MY_CLASS EFL_TEXT_CURSOR_CLASS
|
||||
#define MY_CLASS_NAME "Efl.Text.Cursor"
|
||||
|
@ -434,7 +434,7 @@ void efl_text_cursor_text_object_set(Eo *cursor, Eo *canvas_text_obj, Eo *text_o
|
|||
{
|
||||
Efl_Text_Cursor_Data *pd = efl_data_scope_get(cursor, MY_CLASS);
|
||||
Efl_Text_Cursor_Handle *handle = NULL;
|
||||
if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXT_CLASS))
|
||||
if (efl_isa(canvas_text_obj, EFL_CANVAS_TEXTBLOCK_CLASS))
|
||||
{
|
||||
pd->text_obj = text_obj;
|
||||
handle = evas_object_textblock_cursor_new(canvas_text_obj);
|
||||
|
|
File diff suppressed because it is too large
Load Diff
|
@ -17,7 +17,7 @@ static size_t _hyphen_clients = 0;
|
|||
static void
|
||||
_dicts_hyphen_init(Eo *eo_obj)
|
||||
{
|
||||
Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
|
||||
Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
|
||||
|
||||
if (!o->hyphenating)
|
||||
{
|
||||
|
@ -98,7 +98,7 @@ _dicts_hyphen_free(void)
|
|||
static inline void
|
||||
_dicts_hyphen_detach(Eo *eo_obj)
|
||||
{
|
||||
Efl_Canvas_Text_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
|
||||
Efl_Canvas_Textblock_Data *o = efl_data_scope_get(eo_obj, MY_CLASS);
|
||||
|
||||
if (!o->hyphenating) return;
|
||||
o->hyphenating = EINA_FALSE;
|
||||
|
|
|
@ -138,7 +138,7 @@ typedef Eo Evas_Textblock;
|
|||
* @see evas_textblock_style_set()
|
||||
*/
|
||||
|
||||
typedef struct _Efl_Canvas_Text_Style Evas_Textblock_Style;
|
||||
typedef struct _Efl_Canvas_Textblock_Style Evas_Textblock_Style;
|
||||
|
||||
/**
|
||||
* @typedef Evas_Textblock_Cursor
|
||||
|
@ -921,7 +921,7 @@ EAPI int evas_textblock_cursor_text_prepend(Evas_Textblock_Cursor *cur, const ch
|
|||
*
|
||||
* @param[in] ch The charset name.
|
||||
*
|
||||
* @ingroup Efl_Canvas_Text
|
||||
* @ingroup Efl_Canvas_Textblock
|
||||
*/
|
||||
EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *ch);
|
||||
|
||||
|
@ -930,7 +930,7 @@ EAPI void evas_object_textblock_replace_char_set(Evas_Object *obj, const char *c
|
|||
*
|
||||
* @return The charset name.
|
||||
*
|
||||
* @ingroup Efl_Canvas_Text
|
||||
* @ingroup Efl_Canvas_Textblock
|
||||
*/
|
||||
EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
|
||||
|
||||
|
@ -945,7 +945,7 @@ EAPI const char *evas_object_textblock_replace_char_get(const Evas_Object *obj);
|
|||
*
|
||||
* @since 1.1
|
||||
*
|
||||
* @ingroup Efl_Canvas_Text
|
||||
* @ingroup Efl_Canvas_Textblock
|
||||
*/
|
||||
EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
|
||||
|
||||
|
@ -960,7 +960,7 @@ EAPI void evas_object_textblock_valign_set(Evas_Object *obj, double align);
|
|||
*
|
||||
* @since 1.1
|
||||
*
|
||||
* @ingroup Efl_Canvas_Text
|
||||
* @ingroup Efl_Canvas_Textblock
|
||||
*/
|
||||
EAPI double evas_object_textblock_valign_get(const Evas_Object *obj);
|
||||
|
||||
|
@ -1056,7 +1056,7 @@ EAPI void evas_textblock_cursor_char_delete(Evas_Textblock_Cursor *cur);
|
|||
* @ingroup Evas_Textblock
|
||||
*/
|
||||
EAPI Evas_Textblock_Cursor *evas_object_textblock_cursor_get(const Evas_Object *obj);
|
||||
#include "canvas/efl_canvas_text_eo.legacy.h"
|
||||
#include "canvas/efl_canvas_textblock_eo.legacy.h"
|
||||
/**
|
||||
* @}
|
||||
*/
|
||||
|
|
|
@ -39,7 +39,7 @@ pub_eo_files = [
|
|||
'efl_canvas_animation_group.eo',
|
||||
'efl_canvas_animation_group_parallel.eo',
|
||||
'efl_canvas_animation_group_sequential.eo',
|
||||
'efl_canvas_text_factory.eo',
|
||||
'efl_canvas_textblock_factory.eo',
|
||||
'efl_canvas_rectangle.eo',
|
||||
'efl_canvas_object.eo',
|
||||
'efl_gfx_vg_value_provider.eo',
|
||||
|
@ -55,7 +55,7 @@ pub_eo_files = [
|
|||
'efl_gfx_mapping.eo',
|
||||
'efl_canvas_event_grabber.eo',
|
||||
'efl_text_cursor.eo',
|
||||
'efl_canvas_text.eo',
|
||||
'efl_canvas_textblock.eo',
|
||||
'efl_text_attribute_factory.eo',
|
||||
'efl_canvas_object_animation.eo',
|
||||
]
|
||||
|
@ -106,7 +106,7 @@ evas_legacy_h = files([
|
|||
'efl_canvas_event_grabber_eo.legacy.h',
|
||||
'efl_canvas_group_eo.legacy.h',
|
||||
'efl_canvas_object_eo.legacy.h',
|
||||
'efl_canvas_text_eo.legacy.h',
|
||||
'efl_canvas_textblock_eo.legacy.h',
|
||||
'efl_canvas_vg_container_eo.legacy.h',
|
||||
'efl_canvas_vg_node_eo.legacy.h',
|
||||
'efl_canvas_vg_object_eo.legacy.h',
|
||||
|
|
|
@ -49,7 +49,7 @@ static const char *style_buf =
|
|||
fail_if(strcmp(style_buf, evas_textblock_style_get(st))); \
|
||||
evas_object_textblock_style_set(tb, st); \
|
||||
cur = evas_object_textblock_cursor_new(tb); \
|
||||
cur_obj =efl_canvas_text_cursor_create(tb);\
|
||||
cur_obj =efl_canvas_textblock_cursor_create(tb);\
|
||||
(void) cur_obj;\
|
||||
(void) cur;\
|
||||
do \
|
||||
|
@ -4319,8 +4319,8 @@ EFL_START_TEST(evas_textblock_annotation)
|
|||
START_TB_TEST();
|
||||
Efl_Text_Cursor *start, *end;
|
||||
|
||||
start = efl_canvas_text_cursor_create(tb);
|
||||
end = efl_canvas_text_cursor_create(tb);
|
||||
start = efl_canvas_textblock_cursor_create(tb);
|
||||
end = efl_canvas_textblock_cursor_create(tb);
|
||||
|
||||
const char *buf =
|
||||
"This text will check annotation."
|
||||
|
@ -4353,19 +4353,19 @@ EFL_END_TEST;
|
|||
static const char *efl_style_buf =
|
||||
"" TEST_FONT " font_size=10 color=#000 text_class=entry";
|
||||
|
||||
#define START_EFL_CANVAS_TEXT_TEST() \
|
||||
#define START_EFL_CANVAS_TEXTBLOCK_TEST() \
|
||||
Evas *evas; \
|
||||
Eo *txt; \
|
||||
Efl_Text_Cursor_Handle *cur; \
|
||||
Efl_Text_Cursor *cur_obj; \
|
||||
evas = EVAS_TEST_INIT_EVAS(); \
|
||||
evas_font_hinting_set(evas, EVAS_FONT_HINTING_AUTO); \
|
||||
txt = efl_add(EFL_CANVAS_TEXT_CLASS, evas); \
|
||||
txt = efl_add(EFL_CANVAS_TEXTBLOCK_CLASS, evas); \
|
||||
fail_if(!txt); \
|
||||
efl_canvas_text_newline_as_paragraph_separator_set(txt, EINA_FALSE); \
|
||||
efl_canvas_text_style_apply(txt, efl_style_buf); \
|
||||
fail_if(!efl_canvas_text_all_styles_get(txt)); \
|
||||
cur_obj = efl_canvas_text_cursor_create(txt);\
|
||||
efl_canvas_textblock_newline_as_paragraph_separator_set(txt, EINA_FALSE); \
|
||||
efl_canvas_textblock_style_apply(txt, efl_style_buf); \
|
||||
fail_if(!efl_canvas_textblock_all_styles_get(txt)); \
|
||||
cur_obj = efl_canvas_textblock_cursor_create(txt);\
|
||||
cur = evas_object_textblock_cursor_new(txt); \
|
||||
fail_if(!cur); \
|
||||
do \
|
||||
|
@ -4373,7 +4373,7 @@ do \
|
|||
} \
|
||||
while (0)
|
||||
|
||||
#define END_EFL_CANVAS_TEXT_TEST() \
|
||||
#define END_EFL_CANVAS_TEXTBLOCK_TEST() \
|
||||
do \
|
||||
{ \
|
||||
efl_del(cur_obj); \
|
||||
|
@ -4383,11 +4383,11 @@ do \
|
|||
} \
|
||||
while (0)
|
||||
|
||||
EFL_START_TEST(efl_canvas_text_simple)
|
||||
EFL_START_TEST(efl_canvas_textblock_simple)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
|
||||
/* It is simple test for Efl_Canvas_Text.
|
||||
/* It is simple test for Efl_Canvas_Textblock.
|
||||
* The main object is "txt". */
|
||||
const char *buf = "Th<i>i</i>s is a <br/> te<b>s</b>t.";
|
||||
efl_text_set(txt, buf);
|
||||
|
@ -4403,7 +4403,7 @@ EFL_START_TEST(efl_canvas_text_simple)
|
|||
password = efl_text_password_get(txt);
|
||||
fail_if(password);
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
|
@ -4421,7 +4421,7 @@ EFL_START_TEST(efl_text)
|
|||
* Russian 't' in the beginnning to create additional item.*/
|
||||
/*01234 5 6789012345678 19 01234 */
|
||||
efl_text_set(tb, "тest \u202bנסיוןabcנסיון\u202c bang");
|
||||
size = efl_canvas_text_size_native_get(tb);
|
||||
size = efl_canvas_textblock_size_native_get(tb);
|
||||
nw = size.w;
|
||||
nh = size.h;
|
||||
|
||||
|
@ -4445,9 +4445,9 @@ EFL_START_TEST(efl_text)
|
|||
}
|
||||
EFL_END_TEST
|
||||
|
||||
EFL_START_TEST(efl_canvas_text_cursor)
|
||||
EFL_START_TEST(efl_canvas_textblock_cursor)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
int pos;
|
||||
|
||||
const char *buf = "abcdefghij";
|
||||
|
@ -4469,24 +4469,24 @@ EFL_START_TEST(efl_canvas_text_cursor)
|
|||
pos = efl_text_cursor_position_get(cursor1);
|
||||
ck_assert_int_eq(pos, -1);
|
||||
|
||||
efl_canvas_text_cursor_add(txt, cursor1);
|
||||
efl_canvas_textblock_cursor_add(txt, cursor1);
|
||||
efl_text_cursor_position_set(cursor1, 1);
|
||||
pos = efl_text_cursor_position_get(cursor1);
|
||||
ck_assert_int_eq(pos, 1);
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
|
||||
EFL_START_TEST(efl_canvas_text_markup)
|
||||
EFL_START_TEST(efl_canvas_textblock_markup)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
Efl_Text_Cursor *start, *end;
|
||||
char *res;
|
||||
|
||||
start = efl_canvas_text_cursor_create(txt);
|
||||
end = efl_canvas_text_cursor_create(txt);
|
||||
start = efl_canvas_textblock_cursor_create(txt);
|
||||
end = efl_canvas_textblock_cursor_create(txt);
|
||||
|
||||
efl_text_set(txt, "\n\n\n");
|
||||
|
||||
|
@ -4503,13 +4503,13 @@ EFL_START_TEST(efl_canvas_text_markup)
|
|||
ck_assert_str_eq(res, "bc<br>");
|
||||
free(res);
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
EFL_START_TEST(efl_canvas_text_markup_invalid_escape)
|
||||
EFL_START_TEST(efl_canvas_textblock_markup_invalid_escape)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
|
||||
char * text1 = "Hello";
|
||||
char * text2 = "Hello&123";
|
||||
|
@ -4517,22 +4517,22 @@ EFL_START_TEST(efl_canvas_text_markup_invalid_escape)
|
|||
Eina_Size2D fw1, fw2, fw3;
|
||||
|
||||
efl_text_markup_set(txt,text1);
|
||||
fw1 = efl_canvas_text_size_native_get(txt);
|
||||
fw1 = efl_canvas_textblock_size_native_get(txt);
|
||||
efl_text_markup_set(txt,text2);
|
||||
fw2 = efl_canvas_text_size_native_get(txt);
|
||||
fw2 = efl_canvas_textblock_size_native_get(txt);
|
||||
fail_if(fw2.w <= fw1.w);
|
||||
efl_text_markup_set(txt,text3);
|
||||
fw3 = efl_canvas_text_size_native_get(txt);
|
||||
fw3 = efl_canvas_textblock_size_native_get(txt);
|
||||
fail_if(fw3.w <= fw2.w);
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
|
||||
EFL_START_TEST(efl_text_font)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
|
||||
efl_text_set(txt, "\n\n\n");
|
||||
|
||||
|
@ -4562,13 +4562,13 @@ EFL_START_TEST(efl_text_font)
|
|||
fail_if(30 != font_size);
|
||||
fail_if(strcmp(font,"arial"));
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
EFL_START_TEST(efl_canvas_text_style)
|
||||
EFL_START_TEST(efl_canvas_textblock_style)
|
||||
{
|
||||
START_EFL_CANVAS_TEXT_TEST();
|
||||
START_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
unsigned char r, g, b, a;
|
||||
const char *style;
|
||||
|
||||
|
@ -4578,9 +4578,9 @@ EFL_START_TEST(efl_canvas_text_style)
|
|||
efl_text_font_slant_set(txt, EFL_TEXT_FONT_SLANT_OBLIQUE);
|
||||
efl_text_tabstops_set(txt, 20);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "color=#90E135");
|
||||
efl_canvas_textblock_style_apply(txt, "color=#90E135");
|
||||
|
||||
style = efl_canvas_text_all_styles_get(txt);
|
||||
style = efl_canvas_textblock_all_styles_get(txt);
|
||||
|
||||
// from efl_style_buf
|
||||
fail_if(!strstr(style, "font=DejaVuSans,UnDotum,malayalam"));
|
||||
|
@ -4593,41 +4593,41 @@ EFL_START_TEST(efl_canvas_text_style)
|
|||
fail_if(!strstr(style, "color=rgba(144,225,53,255)"));
|
||||
fail_if(!strstr(style, "password=off"));
|
||||
efl_text_password_set(txt, EINA_TRUE);
|
||||
style = efl_canvas_text_all_styles_get(txt);
|
||||
style = efl_canvas_textblock_all_styles_get(txt);
|
||||
fail_if(!strstr(style, "password=on"));
|
||||
|
||||
efl_canvas_text_style_apply(txt, "font_width=ultracondensed");
|
||||
efl_canvas_textblock_style_apply(txt, "font_width=ultracondensed");
|
||||
ck_assert_int_eq(efl_text_font_width_get(txt), EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "wrap=none");
|
||||
efl_canvas_textblock_style_apply(txt, "wrap=none");
|
||||
ck_assert_int_eq(efl_text_wrap_get(txt), EFL_TEXT_FORMAT_WRAP_NONE);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "backing=on");
|
||||
efl_canvas_textblock_style_apply(txt, "backing=on");
|
||||
ck_assert_int_eq(efl_text_backing_type_get(txt), EFL_TEXT_STYLE_BACKING_TYPE_ENABLED);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "style=far_soft_shadow");
|
||||
efl_canvas_textblock_style_apply(txt, "style=far_soft_shadow");
|
||||
ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SOFT_SHADOW);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "style=glow,top_right");
|
||||
efl_canvas_textblock_style_apply(txt, "style=glow,top_right");
|
||||
ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_GLOW);
|
||||
ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_TOP_RIGHT);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "style=far_shadow,top");
|
||||
efl_canvas_textblock_style_apply(txt, "style=far_shadow,top");
|
||||
ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_FAR_SHADOW);
|
||||
ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_TOP);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "style=soft_outline,top,bottom");
|
||||
efl_canvas_textblock_style_apply(txt, "style=soft_outline,top,bottom");
|
||||
ck_assert_int_eq(efl_text_effect_type_get(txt), EFL_TEXT_STYLE_EFFECT_TYPE_SOFT_OUTLINE);
|
||||
ck_assert_int_eq(efl_text_shadow_direction_get(txt), EFL_TEXT_STYLE_SHADOW_DIRECTION_BOTTOM);
|
||||
|
||||
efl_canvas_text_style_apply(txt, "color=#EF596C");
|
||||
efl_canvas_textblock_style_apply(txt, "color=#EF596C");
|
||||
efl_text_normal_color_get(txt, &r, &g, &b, &a);
|
||||
ck_assert_int_eq(r, 0xEF);
|
||||
ck_assert_int_eq(g, 0x59);
|
||||
ck_assert_int_eq(b, 0x6C);
|
||||
ck_assert_int_eq(a, 0xFF);
|
||||
|
||||
END_EFL_CANVAS_TEXT_TEST();
|
||||
END_EFL_CANVAS_TEXTBLOCK_TEST();
|
||||
}
|
||||
EFL_END_TEST
|
||||
|
||||
|
@ -4659,12 +4659,12 @@ void evas_test_textblock(TCase *tc)
|
|||
#endif
|
||||
tcase_add_test(tc, evas_textblock_text_iface);
|
||||
tcase_add_test(tc, evas_textblock_annotation);
|
||||
tcase_add_test(tc, efl_canvas_text_simple);
|
||||
tcase_add_test(tc, efl_canvas_textblock_simple);
|
||||
tcase_add_test(tc, efl_text);
|
||||
tcase_add_test(tc, efl_canvas_text_cursor);
|
||||
tcase_add_test(tc, efl_canvas_text_markup);
|
||||
tcase_add_test(tc, efl_canvas_text_markup_invalid_escape);
|
||||
tcase_add_test(tc, efl_canvas_textblock_cursor);
|
||||
tcase_add_test(tc, efl_canvas_textblock_markup);
|
||||
tcase_add_test(tc, efl_canvas_textblock_markup_invalid_escape);
|
||||
tcase_add_test(tc, efl_text_font);
|
||||
tcase_add_test(tc, efl_canvas_text_style);
|
||||
tcase_add_test(tc, efl_canvas_textblock_style);
|
||||
}
|
||||
|
||||
|
|
Loading…
Reference in New Issue