summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAli Alzyod <ali198724@gmail.com>2020-01-20 21:25:43 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2020-01-20 21:25:43 +0900
commit085bfb7eafc8a2ffcf52f9fec56e82f327f3e07f (patch)
tree686ed82040c92dca347c7517f2ce7d7d128b821c
parent28675d2705e8b9fe89235e3d893855ea1af6dbb8 (diff)
efl.input.text.hints_type: rename into content_type
Reviewers: woohyun, segfaultxavi Reviewed By: woohyun, segfaultxavi Subscribers: cedric, #reviewers, #committers Tags: #efl Maniphest Tasks: T8541 Differential Revision: https://phab.enlightenment.org/D11130
-rw-r--r--src/lib/efl/interfaces/efl_input_text.eo6
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.c14
-rw-r--r--src/lib/elementary/efl_ui_internal_text_interactive.eo2
-rw-r--r--src/lib/elementary/efl_ui_textbox.c6
4 files changed, 14 insertions, 14 deletions
diff --git a/src/lib/efl/interfaces/efl_input_text.eo b/src/lib/efl/interfaces/efl_input_text.eo
index f563b6dc4f..d967bbeb1a 100644
--- a/src/lib/efl/interfaces/efl_input_text.eo
+++ b/src/lib/efl/interfaces/efl_input_text.eo
@@ -65,7 +65,7 @@ enum @beta Efl.Input_Text.Panel_Return_Key_State
65 disabled, [[The return key on input panel is disabled.]] 65 disabled, [[The return key on input panel is disabled.]]
66} 66}
67 67
68enum @beta Efl.Input_Text.Hints_Type 68enum @beta Efl.Input_Text.Content_Type
69{ 69{
70 [[Enumeration that defines the types of Input Hints.]] 70 [[Enumeration that defines the types of Input Hints.]]
71 none = 0, [[No active hints.]] 71 none = 0, [[No active hints.]]
@@ -178,14 +178,14 @@ interface @beta Efl.Input_Text {
178 } 178 }
179 } 179 }
180 // FIXME: I agree with Mike, looks bad 180 // FIXME: I agree with Mike, looks bad
181 @property input_hint { 181 @property input_content_type @beta {
182 [[The input hint which allows input methods to fine-tune their behavior.]] 182 [[The input hint which allows input methods to fine-tune their behavior.]]
183 set { 183 set {
184 } 184 }
185 get { 185 get {
186 } 186 }
187 values { 187 values {
188 hints: Efl.Input_Text.Hints_Type; [[Input hint.]] 188 hints: Efl.Input_Text.Content_Type; [[Input hint.]]
189 } 189 }
190 } 190 }
191 @property input_panel_layout { 191 @property input_panel_layout {
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.c b/src/lib/elementary/efl_ui_internal_text_interactive.c
index 829c952a65..8c39ed6287 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.c
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.c
@@ -33,7 +33,7 @@ typedef struct _Efl_Ui_Internal_Text_Interactive_Data
33 Efl_Input_Text_Capitalize_Type autocapital_type; 33 Efl_Input_Text_Capitalize_Type autocapital_type;
34 Efl_Input_Text_Panel_Language_Type input_panel_lang; 34 Efl_Input_Text_Panel_Language_Type input_panel_lang;
35 Efl_Input_Text_Panel_Return_Key_Type input_panel_return_key_type; 35 Efl_Input_Text_Panel_Return_Key_Type input_panel_return_key_type;
36 Efl_Input_Text_Hints_Type input_hints; 36 Efl_Input_Text_Content_Type input_hints;
37 Efl_Input_Text_Panel_Return_Key_State input_panel_return_key_state; 37 Efl_Input_Text_Panel_Return_Key_State input_panel_return_key_state;
38 38
39#ifdef HAVE_ECORE_IMF 39#ifdef HAVE_ECORE_IMF
@@ -2044,9 +2044,9 @@ _efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj
2044#endif 2044#endif
2045 2045
2046 if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_PASSWORD) 2046 if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_PASSWORD)
2047 efl_input_text_input_hint_set(obj, ((sd->input_hints & ~EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE) | EFL_INPUT_TEXT_HINTS_TYPE_SENSITIVE_DATA)); 2047 efl_input_text_input_content_type_set(obj, ((sd->input_hints & ~EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE) | EFL_INPUT_TEXT_CONTENT_TYPE_SENSITIVE_DATA));
2048 else if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_TERMINAL) 2048 else if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_TERMINAL)
2049 efl_input_text_input_hint_set(obj, (sd->input_hints & ~EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE)); 2049 efl_input_text_input_content_type_set(obj, (sd->input_hints & ~EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE));
2050} 2050}
2051 2051
2052EOLIAN static Efl_Input_Text_Panel_Layout_Type 2052EOLIAN static Efl_Input_Text_Panel_Layout_Type
@@ -2152,7 +2152,7 @@ _efl_ui_internal_text_interactive_efl_input_text_predictable_get(const Eo *obj,
2152 2152
2153 2153
2154EOLIAN static void 2154EOLIAN static void
2155_efl_ui_internal_text_interactive_efl_input_text_input_hint_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Hints_Type input_hints) 2155_efl_ui_internal_text_interactive_efl_input_text_input_content_type_set(Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en, Efl_Input_Text_Content_Type input_hints)
2156{ 2156{
2157#ifdef HAVE_ECORE_IMF 2157#ifdef HAVE_ECORE_IMF
2158 if (en->imf_context) 2158 if (en->imf_context)
@@ -2166,12 +2166,12 @@ _efl_ui_internal_text_interactive_efl_input_text_input_hint_set(Eo *obj, Efl_Ui_
2166} 2166}
2167 2167
2168 2168
2169EOLIAN static Efl_Input_Text_Hints_Type 2169EOLIAN static Efl_Input_Text_Content_Type
2170_efl_ui_internal_text_interactive_efl_input_text_input_hint_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en) 2170_efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
2171{ 2171{
2172#ifdef HAVE_ECORE_IMF 2172#ifdef HAVE_ECORE_IMF
2173 if (en->imf_context) 2173 if (en->imf_context)
2174 return (Efl_Input_Text_Hints_Type)ecore_imf_context_input_hint_get(en->imf_context); 2174 return (Efl_Input_Text_Content_Type)ecore_imf_context_input_hint_get(en->imf_context);
2175 (void)obj; 2175 (void)obj;
2176#else 2176#else
2177 (void)obj; 2177 (void)obj;
diff --git a/src/lib/elementary/efl_ui_internal_text_interactive.eo b/src/lib/elementary/efl_ui_internal_text_interactive.eo
index 44e871cb9b..448f7a0c6c 100644
--- a/src/lib/elementary/efl_ui_internal_text_interactive.eo
+++ b/src/lib/elementary/efl_ui_internal_text_interactive.eo
@@ -22,7 +22,7 @@ class @beta Efl.Ui.Internal.Text.Interactive extends Efl.Canvas.Textblock implem
22 Efl.Input_Text.autocapitalization { get; set; } 22 Efl.Input_Text.autocapitalization { get; set; }
23 Efl.Input_Text.input_panel_return_key_state { get; set; } 23 Efl.Input_Text.input_panel_return_key_state { get; set; }
24 Efl.Input_Text.predictable { get; set; } 24 Efl.Input_Text.predictable { get; set; }
25 Efl.Input_Text.input_hint { get; set; } 25 Efl.Input_Text.input_content_type { get; set; }
26 Efl.Input_Text.input_panel_layout { get; set; } 26 Efl.Input_Text.input_panel_layout { get; set; }
27 Efl.Input_Text.input_panel_return_key_type { get; set; } 27 Efl.Input_Text.input_panel_return_key_type { get; set; }
28 Efl.Input_Text.input_panel_autoshow { get; set; } 28 Efl.Input_Text.input_panel_autoshow { get; set; }
diff --git a/src/lib/elementary/efl_ui_textbox.c b/src/lib/elementary/efl_ui_textbox.c
index 5aac159959..83ecb12c41 100644
--- a/src/lib/elementary/efl_ui_textbox.c
+++ b/src/lib/elementary/efl_ui_textbox.c
@@ -1903,7 +1903,7 @@ _efl_ui_textbox_efl_object_finalize(Eo *obj,
1903 efl_input_text_input_panel_layout_set(obj, EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_NORMAL); 1903 efl_input_text_input_panel_layout_set(obj, EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_NORMAL);
1904 efl_input_text_input_panel_autoshow_set(obj, EINA_TRUE); 1904 efl_input_text_input_panel_autoshow_set(obj, EINA_TRUE);
1905 efl_input_text_predictable_set(obj, EINA_TRUE); 1905 efl_input_text_predictable_set(obj, EINA_TRUE);
1906 efl_input_text_input_hint_set(obj, EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE); 1906 efl_input_text_input_content_type_set(obj, EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE);
1907 1907
1908 sd->calc_force = EINA_TRUE; 1908 sd->calc_force = EINA_TRUE;
1909 1909
@@ -1984,7 +1984,7 @@ _efl_ui_textbox_efl_text_format_password_set(Eo *obj, Efl_Ui_Textbox_Data *sd, E
1984 if (password) 1984 if (password)
1985 { 1985 {
1986 efl_text_multiline_set(obj, EINA_FALSE); 1986 efl_text_multiline_set(obj, EINA_FALSE);
1987 efl_input_text_input_hint_set(obj, ((efl_input_text_input_hint_get(obj) & ~EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE) | EFL_INPUT_TEXT_HINTS_TYPE_SENSITIVE_DATA)); 1987 efl_input_text_input_content_type_set(obj, ((efl_input_text_input_content_type_get(obj) & ~EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE) | EFL_INPUT_TEXT_CONTENT_TYPE_SENSITIVE_DATA));
1988 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT); 1988 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
1989 } 1989 }
1990 else 1990 else
@@ -1996,7 +1996,7 @@ _efl_ui_textbox_efl_text_format_password_set(Eo *obj, Efl_Ui_Textbox_Data *sd, E
1996 _dnd_leave_cb, NULL, 1996 _dnd_leave_cb, NULL,
1997 _dnd_pos_cb, NULL, 1997 _dnd_pos_cb, NULL,
1998 _dnd_drop_cb, NULL); 1998 _dnd_drop_cb, NULL);
1999 efl_input_text_input_hint_set(obj, ((efl_input_text_input_hint_get(obj) | EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE) & ~EFL_INPUT_TEXT_HINTS_TYPE_SENSITIVE_DATA)); 1999 efl_input_text_input_content_type_set(obj, ((efl_input_text_input_content_type_get(obj) | EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE) & ~EFL_INPUT_TEXT_CONTENT_TYPE_SENSITIVE_DATA));
2000 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY); 2000 efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
2001 } 2001 }
2002 2002