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

Efl text: shorten naming of methods 

eo_prefix are set to "efl_text".
Also, "Efl.Text.Format" is shortened to now include the "_format"
prefix.
"Efl.Text.Font" keeps the "_font" prefix, for better readability.
This commit is contained in:
Daniel Hirt 2017-06-12 00:16:40 +03:00
parent 4fda417bc9
commit 616a60f041
9 changed files with 58 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -123,7 +123,7 @@ my_efl_ui_text_bt_6(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E
{
Eo *text_obj = data;
Efl_Text_Format_Wrap wrap = efl_text_format_wrap_get(text_obj);
Efl_Text_Format_Wrap wrap = efl_text_wrap_get(text_obj);
switch(wrap)
{
@ -142,7 +142,7 @@ my_efl_ui_text_bt_6(void *data, Evas_Object *obj EINA_UNUSED, void *event_info E
default:
break;
}
efl_text_format_wrap_set(text_obj, wrap);
efl_text_wrap_set(text_obj, wrap);
}
static void
@ -167,7 +167,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
evas_object_show(bx);
en = efl_add(EFL_UI_TEXT_CLASS, win,
efl_text_format_multiline_set(efl_added, EINA_TRUE));
efl_text_multiline_set(efl_added, EINA_TRUE));
printf("Added Efl.Ui.Text object\n");
efl_key_data_set(en, "wrap_idx", 0);
@ -179,7 +179,7 @@ test_efl_ui_text(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_text_font_weight_set(en, EFL_TEXT_FONT_WEIGHT_BOLD);
efl_text_font_slant_set(en, EFL_TEXT_FONT_SLANT_ITALIC);
efl_text_font_width_set(en, EFL_TEXT_FONT_WIDTH_ULTRACONDENSED);
efl_text_style_normal_color_set(en, 255, 255, 255, 255);
efl_text_normal_color_set(en, 255, 255, 255, 255);
main_cur = efl_text_cursor_get(en, EFL_TEXT_CURSOR_GET_MAIN);
cur = efl_text_cursor_new(en);

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

@ -522,12 +522,12 @@ test_gfx_filters(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void *eve
efl_gfx_size_hint_weight_set(efl_added, 1.0, 1.0),
efl_gfx_size_hint_align_set(efl_added, -1.0, -1.0),
efl_ui_text_scrollable_set(efl_added, 1),
efl_text_format_multiline_set(efl_added, 1));
efl_text_multiline_set(efl_added, 1));
efl_event_callback_add(o, EFL_UI_TEXT_EVENT_CHANGED_USER, _code_changed, win);
// Insert filter code inside style string: DEFAULT='blah blah <here>'
efl_gfx_filter_program_set(o, code_filter, "code");
efl_text_style_gfx_filter_set(o, "code");
efl_text_gfx_filter_set(o, "code");
// FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME FIXME
// Efl.Ui.Text doesn't seem to trigger the proper events during edit

1
src/lib/efl/interfaces/efl_text_font.eo
View File

@ -42,6 +42,7 @@ interface Efl.Text.Font {
@since 1.20
]]
eo_prefix: efl_text;
methods {
@property font {
[[The font name and size that is used for the displayed text]]

23
src/lib/efl/interfaces/efl_text_format.eo
View File

@ -15,8 +15,9 @@ interface Efl.Text.Format {
@since 1.20
]]
eo_prefix: efl_text;
methods {
@property format_ellipsis {
@property ellipsis {
[[Ellipsis value (number from -1.0 to 1.0)]]
values
{
@ -24,21 +25,21 @@ interface Efl.Text.Format {
}
}
@property format_wrap {
@property wrap {
[[Wrap mode for use in the text]]
values {
wrap: Efl.Text.Format.Wrap;
}
}
@property format_multiline {
@property multiline {
[[Multiline is enabled or not]]
values {
enabled: bool;
}
}
@property format_halign {
@property halign {
[[Horizontal alignment of text (number from 0.0 to 1.0)]]
values
{
@ -46,7 +47,7 @@ interface Efl.Text.Format {
}
}
@property format_valign {
@property valign {
[[Vertical alignment of text (number from -1.0 to 1.0)]]
values
{
@ -54,7 +55,7 @@ interface Efl.Text.Format {
}
}
@property format_linegap {
@property linegap {
[[Minimal line gap (top and bottom) for each line in the text
$value is absolute size.
@ -65,7 +66,7 @@ interface Efl.Text.Format {
}
}
@property format_linerelgap {
@property linerelgap {
[[Relative line gap (top and bottom) for each line in the text
The original line gap value is multiplied by $value.
@ -76,7 +77,7 @@ interface Efl.Text.Format {
}
}
@property format_tabstops {
@property tabstops {
[[Tabstops value]]
values
{
@ -84,7 +85,7 @@ interface Efl.Text.Format {
}
}
@property format_password {
@property password {
[[Whether text is a password]]
values
{
@ -92,10 +93,10 @@ interface Efl.Text.Format {
}
}
@property format_replacement_char {
@property replacement_char {
[[The character used to replace characters that can not be displayed
Currently, only used to replace characters if @.format_password
Currently, only used to replace characters if @.password
is enabled.
]]
values {

1
src/lib/efl/interfaces/efl_text_style.eo
View File

@ -62,6 +62,7 @@ interface Efl.Text.Style {
@since 1.20
]]
eo_prefix: efl_text;
methods {
@property normal_color {
[[Color of text, excluding style]]

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

@ -729,7 +729,7 @@ _key_down_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, void
super = evas_key_modifier_is_set(ev->modifiers, "Super");
altgr = evas_key_modifier_is_set(ev->modifiers, "AltGr");
#endif
multiline = efl_text_format_multiline_get(obj);
multiline = efl_text_multiline_get(obj);
/* Translate some keys to strings. */
if (!strcmp(ev->key, "Tab"))
@ -1256,7 +1256,7 @@ _mouse_move_cb(void *data EINA_UNUSED, Evas *e EINA_UNUSED, Evas_Object *obj, vo
Evas_Textblock_Cursor *tc;
Eina_Bool multiline;
multiline = efl_text_format_multiline_get(obj);
multiline = efl_text_multiline_get(obj);
#ifdef HAVE_ECORE_IMF
if (en->imf_context)
@ -1384,7 +1384,7 @@ _efl_ui_internal_text_interactive_efl_object_finalize(Eo *obj, Efl_Ui_Internal_T
ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET);
#endif
if (efl_text_format_multiline_get(obj))
if (efl_text_multiline_get(obj))
ecore_imf_context_input_hint_set(en->imf_context,
ecore_imf_context_input_hint_get(en->imf_context) | ECORE_IMF_INPUT_HINT_MULTILINE);
}

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

@ -1080,7 +1080,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
sw = edje_object_part_swallow_get(sd->entry_edje, "elm.text");
if (!sw) return;
wrap = efl_text_format_wrap_get(sw);
wrap = efl_text_wrap_get(sw);
if (!sd->changed && (resw == sd->ent_w) && (resh == sd->ent_h)) return;
@ -1105,7 +1105,7 @@ _efl_ui_text_elm_layout_sizing_eval(Eo *obj, Efl_Ui_Text_Data *sd)
if (vw > minw) minw = vw;
efl_gfx_size_set(sd->entry_edje, minw, minh);
if (!efl_text_format_multiline_get(sw))
if (!efl_text_multiline_get(sw))
{
evas_object_size_hint_min_set(obj, -1, minh);
}
@ -2080,7 +2080,7 @@ _entry_changed_handle(void *data,
EFL_UI_TEXT_DATA_GET(data, sd);
single_line = !efl_text_format_multiline_get(obj);
single_line = !efl_text_multiline_get(obj);
evas_event_freeze(evas_object_evas_get(data));
sd->changed = EINA_TRUE;
@ -2997,7 +2997,7 @@ _efl_ui_text_efl_canvas_group_group_add(Eo *obj, Efl_Ui_Text_Data *priv)
priv->editable = EINA_TRUE;
priv->sel_allow = EINA_TRUE;
priv->single_line = !efl_text_format_multiline_get(text_obj);
priv->single_line = !efl_text_multiline_get(text_obj);
priv->drop_format = ELM_SEL_FORMAT_MARKUP | ELM_SEL_FORMAT_IMAGE;
elm_drop_target_add(obj, priv->drop_format,

20
src/lib/evas/canvas/efl_canvas_text.eo
View File

@ -291,16 +291,16 @@ Efl.Text.Font, Efl.Text.Style, Efl.Text.Format, Efl.Text.Cursor, Efl.Text.Annota
Efl.Text.Style.glow_color { get; set; }
Efl.Text.Style.glow2_color { get; set; }
Efl.Text.Style.gfx_filter { get; set; }
Efl.Text.Format.format_ellipsis { get; set; }
Efl.Text.Format.format_wrap { get; set; }
Efl.Text.Format.format_multiline { get; set; }
Efl.Text.Format.format_halign { get; set; }
Efl.Text.Format.format_valign { get; set; }
Efl.Text.Format.format_linegap { get; set; }
Efl.Text.Format.format_linerelgap { get; set; }
Efl.Text.Format.format_tabstops { get; set; }
Efl.Text.Format.format_password { get; set; }
Efl.Text.Format.format_replacement_char { get; set; }
Efl.Text.Format.ellipsis { get; set; }
Efl.Text.Format.wrap { get; set; }
Efl.Text.Format.multiline { get; set; }
Efl.Text.Format.halign { get; set; }
Efl.Text.Format.valign { get; set; }
Efl.Text.Format.linegap { get; set; }
Efl.Text.Format.linerelgap { get; set; }
Efl.Text.Format.tabstops { get; set; }
Efl.Text.Format.password { get; set; }
Efl.Text.Format.replacement_char { get; set; }
Efl.Text.Cursor.cursor { get; }
Efl.Text.Cursor.cursor_position { set; get; }
Efl.Text.Cursor.cursor_content { get; }

42
src/lib/evas/canvas/evas_object_textblock.c
View File

@ -6625,7 +6625,7 @@ evas_object_textblock_add(Evas *e)
return NULL;
MAGIC_CHECK_END();
Evas_Object *eo_obj = efl_add(MY_CLASS, e,
efl_text_format_multiline_set(efl_added, EINA_TRUE));
efl_text_multiline_set(efl_added, EINA_TRUE));
return eo_obj;
}
@ -15311,19 +15311,19 @@ _efl_canvas_text_efl_text_style_gfx_filter_get(Eo *obj EINA_UNUSED, Efl_Canvas_T
}
static void
_efl_canvas_text_efl_text_format_format_ellipsis_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
_efl_canvas_text_efl_text_format_ellipsis_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
{
_FMT_SET(ellipsis, value);
}
static double
_efl_canvas_text_efl_text_format_format_ellipsis_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_ellipsis_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(ellipsis);
}
static void
_efl_canvas_text_efl_text_format_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED)
_efl_canvas_text_efl_text_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Efl_Text_Format_Wrap wrap EINA_UNUSED)
{
_FMT_INFO_SET_START(wrap, wrap);
_FMT(wrap_word) = (wrap == EFL_TEXT_FORMAT_WRAP_WORD);
@ -15334,13 +15334,13 @@ _efl_canvas_text_efl_text_format_format_wrap_set(Eo *obj EINA_UNUSED, Efl_Canvas
}
static Efl_Text_Format_Wrap
_efl_canvas_text_efl_text_format_format_wrap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_wrap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT_INFO(wrap);
}
static void
_efl_canvas_text_efl_text_format_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
_efl_canvas_text_efl_text_format_multiline_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
{
if (o->multiline == enabled) return;
o->multiline = enabled;
@ -15348,13 +15348,13 @@ _efl_canvas_text_efl_text_format_format_multiline_set(Eo *obj EINA_UNUSED, Efl_C
}
static Eina_Bool
_efl_canvas_text_efl_text_format_format_multiline_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_multiline_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return o->multiline;
}
static void
_efl_canvas_text_efl_text_format_format_halign_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
_efl_canvas_text_efl_text_format_halign_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
{
if (value < 0.0)
{
@ -15368,25 +15368,25 @@ _efl_canvas_text_efl_text_format_format_halign_set(Eo *obj EINA_UNUSED, Efl_Canv
}
static double
_efl_canvas_text_efl_text_format_format_halign_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_halign_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return (_FMT(halign_auto) ? -1.0 : _FMT(halign));
}
static void
_efl_canvas_text_efl_text_format_format_valign_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
_efl_canvas_text_efl_text_format_valign_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
{
_FMT_SET(valign, value);
}
static double
_efl_canvas_text_efl_text_format_format_valign_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_valign_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(valign);
}
static void
_efl_canvas_text_efl_text_format_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
_efl_canvas_text_efl_text_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
{
double linerelgap = _FMT(linerelgap);
_FMT(linerelgap) = 0.0;
@ -15404,13 +15404,13 @@ _efl_canvas_text_efl_text_format_format_linegap_set(Eo *obj EINA_UNUSED, Efl_Can
}
static double
_efl_canvas_text_efl_text_format_format_linegap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_linegap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(linegap);
}
static void
_efl_canvas_text_efl_text_format_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
_efl_canvas_text_efl_text_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, double value EINA_UNUSED)
{
double linegap = _FMT(linegap);
_FMT(linegap) = 0.0;
@ -15427,37 +15427,37 @@ _efl_canvas_text_efl_text_format_format_linerelgap_set(Eo *obj EINA_UNUSED, Efl_
}
static double
_efl_canvas_text_efl_text_format_format_linerelgap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_linerelgap_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(linerelgap);
}
static void
_efl_canvas_text_efl_text_format_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, int value EINA_UNUSED)
_efl_canvas_text_efl_text_format_tabstops_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, int value EINA_UNUSED)
{
_FMT_SET(tabstops, value);
}
static int
_efl_canvas_text_efl_text_format_format_tabstops_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_tabstops_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(tabstops);
}
static void
_efl_canvas_text_efl_text_format_format_password_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
_efl_canvas_text_efl_text_format_password_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, Eina_Bool enabled EINA_UNUSED)
{
_FMT_SET(password, enabled);
}
static Eina_Bool
_efl_canvas_text_efl_text_format_format_password_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_password_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return _FMT(password);
}
static void
_efl_canvas_text_efl_text_format_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *repch EINA_UNUSED)
_efl_canvas_text_efl_text_format_replacement_char_set(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED, const char *repch EINA_UNUSED)
{
Eina_Stringshare *nrepch;
if (o->repch != repch)
@ -15478,7 +15478,7 @@ _efl_canvas_text_efl_text_format_format_replacement_char_set(Eo *obj EINA_UNUSED
}
static const char *
_efl_canvas_text_efl_text_format_format_replacement_char_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
_efl_canvas_text_efl_text_format_replacement_char_get(Eo *obj EINA_UNUSED, Efl_Canvas_Text_Data *o EINA_UNUSED)
{
return o->repch;
}