summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2019-12-17 15:54:49 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2019-12-17 15:57:58 +0100
commit365159c5ea83812fe0e5b05cd744db363ce8b28d (patch)
tree4260bfc20de3d462806cd08ceb7609e2342bc5a6
parent8e951504f584f124ba88471fc46f1e7b6d2d3639 (diff)
efl.text.format: rename methods and properties
Summary: efl.text.format: rename methods and properties this change will avoid conflict in the future with other interfaces or class methods. T8533 Reviewers: woohyun, segfaultxavi, zmike, bu5hm4n Reviewed By: segfaultxavi Subscribers: cedric, #committers, #reviewers Tags: #efl Differential Revision: https://phab.enlightenment.org/D10895
-rw-r--r--src/lib/efl/interfaces/efl_text_format.eo6
-rw-r--r--src/lib/evas/canvas/efl_canvas_textblock.eo10
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c12
3 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index 05d5226407..79e62883da 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -54,14 +54,14 @@ interface @beta Efl.Text_Format {
54 } 54 }
55 } 55 }
56 56
57 @property horizontal_align_auto_type { 57 @property text_horizontal_align_auto_type {
58 [[Horizontal alignment of text.]] 58 [[Horizontal alignment of text.]]
59 values { 59 values {
60 value: Efl.Text_Format_Horizontal_Alignment_Auto_Type; [[Alignment type.]] 60 value: Efl.Text_Format_Horizontal_Alignment_Auto_Type; [[Alignment type.]]
61 } 61 }
62 } 62 }
63 63
64 @property horizontal_align { 64 @property text_horizontal_align {
65 [[Horizontal alignment of text. $[0.0] means "left" 65 [[Horizontal alignment of text. $[0.0] means "left"
66 and $[1.0] means "right".]] 66 and $[1.0] means "right".]]
67 values { 67 values {
@@ -69,7 +69,7 @@ interface @beta Efl.Text_Format {
69 } 69 }
70 } 70 }
71 71
72 @property vertical_align { 72 @property text_vertical_align {
73 [[Vertical alignment of text.$[0.0] means "top" 73 [[Vertical alignment of text.$[0.0] means "top"
74 and $[1.0] means "bottom"]] 74 and $[1.0] means "bottom"]]
75 values { 75 values {
diff --git a/src/lib/evas/canvas/efl_canvas_textblock.eo b/src/lib/evas/canvas/efl_canvas_textblock.eo
index 3b686918ee..d183574817 100644
--- a/src/lib/evas/canvas/efl_canvas_textblock.eo
+++ b/src/lib/evas/canvas/efl_canvas_textblock.eo
@@ -194,7 +194,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
194 $right (Puts the text at the right of the line), $start (Alias for $auto), $end (Puts the text at the 194 $right (Puts the text at the right of the line), $start (Alias for $auto), $end (Puts the text at the
195 opposite side of LTR/RTL settings). 195 opposite side of LTR/RTL settings).
196 Default value is $auto. 196 Default value is $auto.
197 See @Efl.Text_Format.horizontal_align. 197 See @Efl.Text_Format.text_horizontal_align.
198 198
199 - $valign: Vertical alignment of the text. The value can either be a decimal number ($[0.0] means "top" 199 - $valign: Vertical alignment of the text. The value can either be a decimal number ($[0.0] means "top"
200 and $[1.0] means "bottom"), a percentage ($[0%] means "top" and $[100%] means "bottom") or one of: 200 and $[1.0] means "bottom"), a percentage ($[0%] means "top" and $[100%] means "bottom") or one of:
@@ -202,7 +202,7 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
202 $middle (Alias for $center), $bottom (Puts the text at the bottom of the text box), 202 $middle (Alias for $center), $bottom (Puts the text at the bottom of the text box),
203 $baseline (Puts the text's baseline at the middle of the text box), $base (Alias for $baseline). 203 $baseline (Puts the text's baseline at the middle of the text box), $base (Alias for $baseline).
204 Default value is $baseline. 204 Default value is $baseline.
205 See @Efl.Text_Format.vertical_align. 205 See @Efl.Text_Format.text_vertical_align.
206 206
207 - $wrap: Wrapping policy of the text. The value must be one of the following: $word (Only wraps lines at 207 - $wrap: Wrapping policy of the text. The value must be one of the following: $word (Only wraps lines at
208 word boundaries), $char (Wraps at any character), $mixed (Wraps at word boundaries if possible, 208 word boundaries), $char (Wraps at any character), $mixed (Wraps at word boundaries if possible,
@@ -479,9 +479,9 @@ class @beta Efl.Canvas.Textblock extends Efl.Canvas.Object implements Efl.Text,
479 Efl.Text_Format.ellipsis { get; set; } 479 Efl.Text_Format.ellipsis { get; set; }
480 Efl.Text_Format.wrap { get; set; } 480 Efl.Text_Format.wrap { get; set; }
481 Efl.Text_Format.multiline { get; set; } 481 Efl.Text_Format.multiline { get; set; }
482 Efl.Text_Format.horizontal_align { get; set; } 482 Efl.Text_Format.text_horizontal_align { get; set; }
483 Efl.Text_Format.horizontal_align_auto_type { get; set; } 483 Efl.Text_Format.text_horizontal_align_auto_type { get; set; }
484 Efl.Text_Format.vertical_align { get; set; } 484 Efl.Text_Format.text_vertical_align { get; set; }
485 Efl.Text_Format.linegap { get; set; } 485 Efl.Text_Format.linegap { get; set; }
486 Efl.Text_Format.linerelgap { get; set; } 486 Efl.Text_Format.linerelgap { get; set; }
487 Efl.Text_Format.tabstops { get; set; } 487 Efl.Text_Format.tabstops { get; set; }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 63f725f00c..3af3fb2897 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16750,7 +16750,7 @@ _efl_canvas_textblock_efl_text_format_multiline_get(const Eo *obj EINA_UNUSED, E
16750} 16750}
16751 16751
16752static void 16752static void
16753_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type) 16753_efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_set(Eo *obj, Efl_Canvas_Textblock_Data *o, Efl_Text_Format_Horizontal_Alignment_Auto_Type type)
16754{ 16754{
16755 ASYNC_BLOCK; 16755 ASYNC_BLOCK;
16756 if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE) 16756 if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE)
@@ -16772,7 +16772,7 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_set(Eo *obj, Ef
16772} 16772}
16773 16773
16774static Efl_Text_Format_Horizontal_Alignment_Auto_Type 16774static Efl_Text_Format_Horizontal_Alignment_Auto_Type
16775_efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o) 16775_efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o)
16776{ 16776{
16777 Efl_Text_Format_Horizontal_Alignment_Auto_Type ret = 16777 Efl_Text_Format_Horizontal_Alignment_Auto_Type ret =
16778 EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE; 16778 EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NONE;
@@ -16793,7 +16793,7 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_auto_type_get(const Eo *o
16793} 16793}
16794 16794
16795static void 16795static void
16796_efl_canvas_textblock_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o, 16796_efl_canvas_textblock_efl_text_format_text_horizontal_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
16797 double value) 16797 double value)
16798{ 16798{
16799 ASYNC_BLOCK; 16799 ASYNC_BLOCK;
@@ -16803,13 +16803,13 @@ _efl_canvas_textblock_efl_text_format_horizontal_align_set(Eo *obj, Efl_Canvas_T
16803} 16803}
16804 16804
16805static double 16805static double
16806_efl_canvas_textblock_efl_text_format_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16806_efl_canvas_textblock_efl_text_format_text_horizontal_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16807{ 16807{
16808 return _FMT(halign); 16808 return _FMT(halign);
16809} 16809}
16810 16810
16811static void 16811static void
16812_efl_canvas_textblock_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o, 16812_efl_canvas_textblock_efl_text_format_text_vertical_align_set(Eo *obj, Efl_Canvas_Textblock_Data *o,
16813 double value) 16813 double value)
16814{ 16814{
16815 ASYNC_BLOCK; 16815 ASYNC_BLOCK;
@@ -16821,7 +16821,7 @@ _efl_canvas_textblock_efl_text_format_vertical_align_set(Eo *obj, Efl_Canvas_Tex
16821} 16821}
16822 16822
16823static double 16823static double
16824_efl_canvas_textblock_efl_text_format_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED) 16824_efl_canvas_textblock_efl_text_format_text_vertical_align_get(const Eo *obj EINA_UNUSED, Efl_Canvas_Textblock_Data *o EINA_UNUSED)
16825{ 16825{
16826 return o->valign; 16826 return o->valign;
16827} 16827}