Yeah, thanks. I also hated it that we had elipsis, that's why I added ellipsis as an alias. Anyhow, yeah, thanks for fixing internally as well.
-- Tom. On 13/05/14 21:21, Mike Blumenkrantz wrote: > discomfitor pushed a commit to branch master. > > http://git.enlightenment.org/core/efl.git/commit/?id=894c36ff112917a9ced45dd947546f63206eeb02 > > commit 894c36ff112917a9ced45dd947546f63206eeb02 > Author: Mike Blumenkrantz <[email protected]> > Date: Tue May 13 16:20:41 2014 -0400 > > de-elipsis edje > > the word is "ellipsis". it's bad enough that we have released misspelled > api, but we can at least spell things correctly internally. > --- > src/bin/edje/edje_cc_handlers.c | 12 ++++++------ > src/bin/edje/edje_data_convert.c | 2 +- > src/bin/edje/edje_inspector.c | 4 ++-- > src/lib/edje/edje_calc.c | 4 ++-- > src/lib/edje/edje_data.c | 4 ++-- > src/lib/edje/edje_edit.c | 6 +++--- > src/lib/edje/edje_private.h | 6 +++--- > src/lib/edje/edje_text.c | 12 ++++++------ > 8 files changed, 25 insertions(+), 25 deletions(-) > > diff --git a/src/bin/edje/edje_cc_handlers.c b/src/bin/edje/edje_cc_handlers.c > index cc89b1f..838aa99 100644 > --- a/src/bin/edje/edje_cc_handlers.c > +++ b/src/bin/edje/edje_cc_handlers.c > @@ -342,7 +342,7 @@ static void > st_collections_group_parts_part_description_text_max(void); > static void st_collections_group_parts_part_description_text_align(void); > static void st_collections_group_parts_part_description_text_source(void); > static void > st_collections_group_parts_part_description_text_text_source(void); > -static void st_collections_group_parts_part_description_text_elipsis(void); > +static void st_collections_group_parts_part_description_text_ellipsis(void); > static void st_collections_group_parts_part_description_text_filter(void); > static void st_collections_group_parts_part_description_box_layout(void); > static void st_collections_group_parts_part_description_box_align(void); > @@ -688,8 +688,8 @@ New_Statement_Handler statement_handlers[] = > {"collections.group.parts.part.description.text.text_source", > st_collections_group_parts_part_description_text_text_source}, > {"collections.group.parts.part.description.text.font", st_fonts_font}, > /* dup */ > {"collections.group.parts.part.description.text.fonts.font", > st_fonts_font}, /* dup */ > - {"collections.group.parts.part.description.text.elipsis", > st_collections_group_parts_part_description_text_elipsis}, > - {"collections.group.parts.part.description.text.ellipsis", > st_collections_group_parts_part_description_text_elipsis}, > + {"collections.group.parts.part.description.text.elipsis", > st_collections_group_parts_part_description_text_ellipsis}, > + {"collections.group.parts.part.description.text.ellipsis", > st_collections_group_parts_part_description_text_ellipsis}, > {"collections.group.parts.part.description.text.filter", > st_collections_group_parts_part_description_text_filter}, > {"collections.group.parts.part.description.box.layout", > st_collections_group_parts_part_description_box_layout}, > {"collections.group.parts.part.description.box.align", > st_collections_group_parts_part_description_box_align}, > @@ -8399,7 +8399,7 @@ > st_collections_group_parts_part_description_text_text_source(void) > @endproperty > */ > static void > -st_collections_group_parts_part_description_text_elipsis(void) > +st_collections_group_parts_part_description_text_ellipsis(void) > { > Edje_Part_Description_Text *ed; > > @@ -8415,7 +8415,7 @@ > st_collections_group_parts_part_description_text_elipsis(void) > > ed = (Edje_Part_Description_Text*) current_desc; > > - ed->text.elipsis = parse_float_range(0, -1.0, 1.0); > + ed->text.ellipsis = parse_float_range(0, -1.0, 1.0); > } > > /** > @@ -11301,7 +11301,7 @@ _part_text_ellipsis_check(Edje_Part *ep, > Edje_Part_Description_Common *desc) > > ed = (Edje_Part_Description_Text*)desc; > > - return ((ed->text.elipsis != -1) && ed->text.min_x); > + return ((ed->text.ellipsis != -1) && ed->text.min_x); > } > > static void > diff --git a/src/bin/edje/edje_data_convert.c > b/src/bin/edje/edje_data_convert.c > index 5fb129e..0f72a29 100644 > --- a/src/bin/edje/edje_data_convert.c > +++ b/src/bin/edje/edje_data_convert.c > @@ -330,7 +330,7 @@ _edje_edd_old_init(void) > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "text.align.y", text.align.y, EDJE_T_FLOAT); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "text.id_source", text.id_source, EET_T_INT); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "text.id_text_source", text.id_text_source, > EET_T_INT); > - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "text.elipsis", text.elipsis, EET_T_DOUBLE); > + EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "text.ellipsis", text.ellipsis, EET_T_DOUBLE); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "box.layout", box.layout, EET_T_STRING); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "box.alt_layout", box.alt_layout, EET_T_STRING); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_old_edje_part_description, > Old_Edje_Part_Description, "box.align.x", box.align.x, EDJE_T_FLOAT); > diff --git a/src/bin/edje/edje_inspector.c b/src/bin/edje/edje_inspector.c > index fd8972f..9a4a448 100644 > --- a/src/bin/edje/edje_inspector.c > +++ b/src/bin/edje/edje_inspector.c > @@ -626,8 +626,8 @@ state_details(Evas_Object *ed, const char *ppart, const > char *state, double valu > else if ((x) || (y)) printf(INDENT5 "fit: %d %d;\n", x, y); > > dx = edje_edit_state_text_elipsis_get(ed, ppart, state, value); > - if (machine) printf("TEXT-ELIPSIS: %g\n", dx); > - else if (FDIFF(dx, 0.5)) printf(INDENT5 "elipsis: %g;\n", dx); > + if (machine) printf("TEXT-ELLIPSIS: %g\n", dx); > + else if (FDIFF(dx, 0.5)) printf(INDENT5 "ellipsis: %g;\n", dx); > > if (machine) puts("TEXT-END"); > else puts(INDENT4 "}"); > diff --git a/src/lib/edje/edje_calc.c b/src/lib/edje/edje_calc.c > index 1a97616..d22622e 100644 > --- a/src/lib/edje/edje_calc.c > +++ b/src/lib/edje/edje_calc.c > @@ -2491,7 +2491,7 @@ _edje_part_recalc_single(Edje *ed, > /* text.align */ > params->type.text.align.x = text_desc->text.align.x; > params->type.text.align.y = text_desc->text.align.y; > - params->type.text.elipsis = text_desc->text.elipsis; > + params->type.text.ellipsis = text_desc->text.ellipsis; > > /* text colors */ > if (cc) > @@ -3608,7 +3608,7 @@ _edje_part_recalc(Edje *ed, Edje_Real_Part *ep, int > flags, Edje_Calc_Params *sta > > p3->type.text.align.x = FFP(p1->type.text.align.x, > p2->type.text.align.x, pos); > p3->type.text.align.y = FFP(p1->type.text.align.y, > p2->type.text.align.y, pos); > - p3->type.text.elipsis = TO_DOUBLE(FINTP(p1->type.text.elipsis, > p2->type.text.elipsis, pos2)); > + p3->type.text.ellipsis = > TO_DOUBLE(FINTP(p1->type.text.ellipsis, p2->type.text.ellipsis, pos2)); > break; > } > > diff --git a/src/lib/edje/edje_data.c b/src/lib/edje/edje_data.c > index 63f8952..c1490c1 100644 > --- a/src/lib/edje/edje_data.c > +++ b/src/lib/edje/edje_data.c > @@ -828,7 +828,7 @@ _edje_edd_init(void) > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.id_source_part", text.id_source_part, > EET_T_STRING); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.id_text_source", text.id_text_source, > EET_T_INT); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.id_text_source_part", > text.id_text_source_part, EET_T_STRING); > - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.elipsis", text.elipsis, EET_T_DOUBLE); > + EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.ellipsis", text.ellipsis, EET_T_DOUBLE); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.filter", text.filter, EET_T_STRING); > > EET_DATA_DESCRIPTOR_ADD_LIST_STRING(_edje_edd_edje_part_description_text, > Edje_Part_Description_Text, "text.filter_sources", text.filter_sources); > > @@ -862,7 +862,7 @@ _edje_edd_init(void) > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_textblock, > Edje_Part_Description_Text, "text.id_source_part", text.id_source_part, > EET_T_STRING); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_textblock, > Edje_Part_Description_Text, "text.id_text_source", text.id_text_source, > EET_T_INT); > EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_textblock, > Edje_Part_Description_Text, "text.id_text_source_part", > text.id_text_source_part, EET_T_STRING); > - EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_textblock, > Edje_Part_Description_Text, "text.elipsis", text.elipsis, EET_T_DOUBLE); > + EET_DATA_DESCRIPTOR_ADD_BASIC(_edje_edd_edje_part_description_textblock, > Edje_Part_Description_Text, "text.ellipsis", text.ellipsis, EET_T_DOUBLE); > > EET_EINA_FILE_DATA_DESCRIPTOR_CLASS_SET(&eddc, > Edje_Part_Description_Box); > eddc.func.mem_free = mem_free_box; > diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c > index 543cef6..bf49130 100644 > --- a/src/lib/edje/edje_edit.c > +++ b/src/lib/edje/edje_edit.c > @@ -4526,7 +4526,7 @@ edje_edit_state_text_size_set(Evas_Object *obj, const > char *part, const char *st > > FUNC_TEXT_DOUBLE(align_x, align.x, -1.0); > FUNC_TEXT_DOUBLE(align_y, align.y, 0.0); > -FUNC_TEXT_DOUBLE(elipsis, elipsis, -1.0); > +FUNC_TEXT_DOUBLE(elipsis, ellipsis, -1.0); > > #define FUNC_TEXT_BOOL(Name, Type) \ > EAPI Eina_Bool \ > @@ -7734,8 +7734,8 @@ _edje_generate_source_of_state(Evas_Object *obj, const > char *part, const char *s > BUF_APPENDF(I6"align: %g %g;\n", TO_DOUBLE(txt->text.align.x), > TO_DOUBLE(txt->text.align.y)); > //TODO Support source > //TODO Support text_source > - if (txt->text.elipsis) > - BUF_APPENDF(I6"elipsis: %g;\n", txt->text.elipsis); > + if (txt->text.ellipsis) > + BUF_APPENDF(I6"ellipsis: %g;\n", txt->text.ellipsis); > BUF_APPEND(I5"}\n"); > } > > diff --git a/src/lib/edje/edje_private.h b/src/lib/edje/edje_private.h > index eb3c3c6..1424cdb 100644 > --- a/src/lib/edje/edje_private.h > +++ b/src/lib/edje/edje_private.h > @@ -1202,7 +1202,7 @@ struct _Edje_Part_Description_Spec_Text > Edje_Alignment align; /* text alignment within bounds */ > Edje_Color color3; > > - double elipsis; /* 0.0 - 1.0 defining where the elipsis align */ > + double ellipsis; /* 0.0 - 1.0 defining where the ellipsis align */ > int size; /* 0 = use user set size */ > int id_source; /* -1 if none */ > char *id_source_part; > @@ -1484,7 +1484,7 @@ struct _Edje_Calc_Params > } common; // 40 > struct { > Edje_Alignment align; /* text alignment within bounds */ // 16 > - double elipsis; // 8 > + double ellipsis; // 8 > int size; // 4 > Edje_Color color2, color3; // 8 > } text; // 36 > @@ -1563,7 +1563,7 @@ struct _Edje_Real_Part_Text > unsigned char fit_x, fit_y; // 2 > short in_size; // 2 > short out_size; // 2 > - float elipsis; // 4 > + float ellipsis; // 4 > Evas_Coord in_w, in_h; // 8 > const char *in_str; // 4 > const char *out_str; // 4 > diff --git a/src/lib/edje/edje_text.c b/src/lib/edje/edje_text.c > index ee35101..db98a60 100644 > --- a/src/lib/edje/edje_text.c > +++ b/src/lib/edje/edje_text.c > @@ -91,13 +91,13 @@ _edje_text_fit_x(Edje *ed, Edje_Real_Part *ep, > *free_text = 0; > if (sw <= 1) return ""; > > - if (params->type.text.elipsis < 0) > + if (params->type.text.ellipsis < 0) > return text; > > if (ep->part->scale) evas_object_scale_set(ep->object, TO_DOUBLE(sc)); > > eo_do(ep->object, > - evas_obj_text_ellipsis_set(params->type.text.elipsis), > + evas_obj_text_ellipsis_set(params->type.text.ellipsis), > evas_obj_text_font_set(font, size), > evas_obj_text_text_set(text), > evas_obj_size_set(sw, sh)); > @@ -273,7 +273,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, > same_text && > (ep->typedata.text->cache.align_x == params->type.text.align.x) && > (ep->typedata.text->cache.align_y == params->type.text.align.y) && > - (ep->typedata.text->cache.elipsis == params->type.text.elipsis) && > + (ep->typedata.text->cache.ellipsis == params->type.text.ellipsis) && > (ep->typedata.text->cache.fit_x == chosen_desc->text.fit_x) && > (ep->typedata.text->cache.fit_y == chosen_desc->text.fit_y) && > (ep->typedata.text->cache.in_font == font)) > @@ -439,9 +439,9 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, > * 22 April 2014 > */ > else if (((ed->file->version >= 3) && (ed->file->minor >= 6)) || > - params->type.text.elipsis) > + params->type.text.ellipsis) > eo_do(ep->object, > - evas_obj_text_ellipsis_set(params->type.text.elipsis)); > + evas_obj_text_ellipsis_set(params->type.text.ellipsis)); > > eina_stringshare_replace(&ep->typedata.text->cache.out_str, text); > ep->typedata.text->cache.in_w = sw; > @@ -450,7 +450,7 @@ _edje_text_recalc_apply(Edje *ed, Edje_Real_Part *ep, > ep->typedata.text->cache.out_size = size; > ep->typedata.text->cache.align_x = params->type.text.align.x; > ep->typedata.text->cache.align_y = params->type.text.align.y; > - ep->typedata.text->cache.elipsis = params->type.text.elipsis; > + ep->typedata.text->cache.ellipsis = params->type.text.ellipsis; > ep->typedata.text->cache.fit_x = chosen_desc->text.fit_x; > ep->typedata.text->cache.fit_y = chosen_desc->text.fit_y; > arrange_text: > ------------------------------------------------------------------------------ "Accelerate Dev Cycles with Automated Cross-Browser Testing - For FREE Instantly run your Selenium tests across 300+ browser/OS combos. Get unparalleled scalability from the best Selenium testing platform available Simple to use. Nothing to install. Get started now for free." http://p.sf.net/sfu/SauceLabs _______________________________________________ enlightenment-devel mailing list [email protected] https://lists.sourceforge.net/lists/listinfo/enlightenment-devel
