summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2020-01-03 12:06:25 +0100
committerXavi Artigas <xavierartigas@yahoo.es>2020-01-08 16:11:38 +0100
commit43ad91ee406cbcc5715486813324a2eecbd5ece4 (patch)
tree2285bb8eae6c389a751057b188964a7dd11a6461
parent5140c43960c9fc29dce279e73035bc7d2fd9146f (diff)
Text_Format_Horizontal_Alignment_Auto_Type: rename enums, and Doc details
Summary: Text_Format_Horizontal_Alignment_Auto_Type: rename enums, and Doc details Reviewers: woohyun, ali.alzyod Reviewed By: ali.alzyod Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T7939 Differential Revision: https://phab.enlightenment.org/D10993
-rw-r--r--src/lib/efl/interfaces/efl_text_format.eo17
-rw-r--r--src/lib/evas/canvas/evas_object_textblock.c4
2 files changed, 13 insertions, 8 deletions
diff --git a/src/lib/efl/interfaces/efl_text_format.eo b/src/lib/efl/interfaces/efl_text_format.eo
index 5c974a675e..03a44295a5 100644
--- a/src/lib/efl/interfaces/efl_text_format.eo
+++ b/src/lib/efl/interfaces/efl_text_format.eo
@@ -9,10 +9,10 @@ enum @beta Efl.Text_Format_Wrap {
9} 9}
10 10
11enum @beta Efl.Text_Format_Horizontal_Alignment_Auto_Type { 11enum @beta Efl.Text_Format_Horizontal_Alignment_Auto_Type {
12 [[Auto-horizontal alignment of the text.]] 12 [[Auto-horizontal alignment setting for the text (Left-To-Right or Right-To-Left).]]
13 none, [[No auto-alignment rule.]] 13 none, [[No auto-alignment rule: Horizontal Alignment is decided by @Efl.Text_Format.text_horizontal_align]]
14 normal, [[Respects LTR/RTL (bidirectional) settings.]] 14 auto, [[Respects LTR/RTL (bidirectional) characters found inside the text content.]]
15 locale, [[Respects locale's language settings.]] 15 locale, [[Respects the system's language settings.]]
16 end [[Text is placed at opposite side of LTR/RTL (bidirectional) settings.]] 16 end [[Text is placed at opposite side of LTR/RTL (bidirectional) settings.]]
17} 17}
18 18
@@ -55,7 +55,7 @@ interface @beta Efl.Text_Format {
55 } 55 }
56 56
57 @property text_horizontal_align_auto_type { 57 @property text_horizontal_align_auto_type {
58 [[Horizontal alignment of text.]] 58 [[Specifies when the text's horizontal alignment should be set automatically.]]
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 }
@@ -63,7 +63,12 @@ interface @beta Efl.Text_Format {
63 63
64 @property text_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 Setting this value also sets @.text_horizontal_align_auto_type to
68 @Efl.Text_Format_Horizontal_Alignment_Auto_Type.none.
69 This value is ignored when @.text_horizontal_align_auto_type is set to anything other than
70 @Efl.Text_Format_Horizontal_Alignment_Auto_Type.none.
71 ]]
67 values { 72 values {
68 value: double; [[Alignment value between $[0.0] and $[1.0].]] 73 value: double; [[Alignment value between $[0.0] and $[1.0].]]
69 } 74 }
diff --git a/src/lib/evas/canvas/evas_object_textblock.c b/src/lib/evas/canvas/evas_object_textblock.c
index 1dcad334c6..93c7a4b5d5 100644
--- a/src/lib/evas/canvas/evas_object_textblock.c
+++ b/src/lib/evas/canvas/evas_object_textblock.c
@@ -16773,7 +16773,7 @@ _efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_set(Eo *ob
16773 { 16773 {
16774 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NONE); 16774 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NONE);
16775 } 16775 }
16776 else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL) 16776 else if (type == EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_AUTO)
16777 { 16777 {
16778 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL); 16778 _FMT_SET(halign_auto, EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL);
16779 } 16779 }
@@ -16795,7 +16795,7 @@ _efl_canvas_textblock_efl_text_format_text_horizontal_align_auto_type_get(const
16795 16795
16796 if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL) 16796 if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_NORMAL)
16797 { 16797 {
16798 ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_NORMAL; 16798 ret = EFL_TEXT_FORMAT_HORIZONTAL_ALIGNMENT_AUTO_TYPE_AUTO;
16799 } 16799 }
16800 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_END) 16800 else if (_FMT(halign_auto) == EVAS_TEXTBLOCK_ALIGN_AUTO_END)
16801 { 16801 {