woohyun pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=085bfb7eafc8a2ffcf52f9fec56e82f327f3e07f
commit 085bfb7eafc8a2ffcf52f9fec56e82f327f3e07f
Author: Ali Alzyod <ali198...@gmail.com>
Date: Mon Jan 20 21:25:43 2020 +0900
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
---
src/lib/efl/interfaces/efl_input_text.eo | 6 +++---
src/lib/elementary/efl_ui_internal_text_interactive.c | 14 +++++++-------
src/lib/elementary/efl_ui_internal_text_interactive.eo | 2 +-
src/lib/elementary/efl_ui_textbox.c | 6 +++---
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
disabled, [[The return key on input panel is disabled.]]
}
-enum @beta Efl.Input_Text.Hints_Type
+enum @beta Efl.Input_Text.Content_Type
{
[[Enumeration that defines the types of Input Hints.]]
none = 0, [[No active hints.]]
@@ -178,14 +178,14 @@ interface @beta Efl.Input_Text {
}
}
// FIXME: I agree with Mike, looks bad
- @property input_hint {
+ @property input_content_type @beta {
[[The input hint which allows input methods to fine-tune their
behavior.]]
set {
}
get {
}
values {
- hints: Efl.Input_Text.Hints_Type; [[Input hint.]]
+ hints: Efl.Input_Text.Content_Type; [[Input hint.]]
}
}
@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
Efl_Input_Text_Capitalize_Type autocapital_type;
Efl_Input_Text_Panel_Language_Type input_panel_lang;
Efl_Input_Text_Panel_Return_Key_Type input_panel_return_key_type;
- Efl_Input_Text_Hints_Type input_hints;
+ Efl_Input_Text_Content_Type input_hints;
Efl_Input_Text_Panel_Return_Key_State input_panel_return_key_state;
#ifdef HAVE_ECORE_IMF
@@ -2044,9 +2044,9 @@
_efl_ui_internal_text_interactive_efl_input_text_input_panel_layout_set(Eo *obj
#endif
if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_PASSWORD)
- efl_input_text_input_hint_set(obj, ((sd->input_hints &
~EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE) |
EFL_INPUT_TEXT_HINTS_TYPE_SENSITIVE_DATA));
+ 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));
else if (layout == EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_TERMINAL)
- efl_input_text_input_hint_set(obj, (sd->input_hints &
~EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE));
+ efl_input_text_input_content_type_set(obj, (sd->input_hints &
~EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE));
}
EOLIAN static Efl_Input_Text_Panel_Layout_Type
@@ -2152,7 +2152,7 @@
_efl_ui_internal_text_interactive_efl_input_text_predictable_get(const Eo *obj,
EOLIAN static void
-_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)
+_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)
{
#ifdef HAVE_ECORE_IMF
if (en->imf_context)
@@ -2166,12 +2166,12 @@
_efl_ui_internal_text_interactive_efl_input_text_input_hint_set(Eo *obj, Efl_Ui_
}
-EOLIAN static Efl_Input_Text_Hints_Type
-_efl_ui_internal_text_interactive_efl_input_text_input_hint_get(const Eo *obj,
Efl_Ui_Internal_Text_Interactive_Data *en)
+EOLIAN static Efl_Input_Text_Content_Type
+_efl_ui_internal_text_interactive_efl_input_text_input_content_type_get(const
Eo *obj, Efl_Ui_Internal_Text_Interactive_Data *en)
{
#ifdef HAVE_ECORE_IMF
if (en->imf_context)
- return
(Efl_Input_Text_Hints_Type)ecore_imf_context_input_hint_get(en->imf_context);
+ return
(Efl_Input_Text_Content_Type)ecore_imf_context_input_hint_get(en->imf_context);
(void)obj;
#else
(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
Efl.Input_Text.autocapitalization { get; set; }
Efl.Input_Text.input_panel_return_key_state { get; set; }
Efl.Input_Text.predictable { get; set; }
- Efl.Input_Text.input_hint { get; set; }
+ Efl.Input_Text.input_content_type { get; set; }
Efl.Input_Text.input_panel_layout { get; set; }
Efl.Input_Text.input_panel_return_key_type { get; set; }
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,
efl_input_text_input_panel_layout_set(obj,
EFL_INPUT_TEXT_PANEL_LAYOUT_TYPE_NORMAL);
efl_input_text_input_panel_autoshow_set(obj, EINA_TRUE);
efl_input_text_predictable_set(obj, EINA_TRUE);
- efl_input_text_input_hint_set(obj, EFL_INPUT_TEXT_HINTS_TYPE_AUTO_COMPLETE);
+ efl_input_text_input_content_type_set(obj,
EFL_INPUT_TEXT_CONTENT_TYPE_AUTO_COMPLETE);
sd->calc_force = EINA_TRUE;
@@ -1984,7 +1984,7 @@ _efl_ui_textbox_efl_text_format_password_set(Eo *obj,
Efl_Ui_Textbox_Data *sd, E
if (password)
{
efl_text_multiline_set(obj, EINA_FALSE);
- 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));
+ 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));
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_PASSWORD_TEXT);
}
else
@@ -1996,7 +1996,7 @@ _efl_ui_textbox_efl_text_format_password_set(Eo *obj,
Efl_Ui_Textbox_Data *sd, E
_dnd_leave_cb, NULL,
_dnd_pos_cb, NULL,
_dnd_drop_cb, NULL);
- 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));
+ 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));
efl_access_object_role_set(obj, EFL_ACCESS_ROLE_ENTRY);
}
--
