summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorJihoon Kim <jihoon48.kim@samsung.com>2016-05-18 15:20:05 +0900
committerJihoon Kim <jihoon48.kim@samsung.com>2016-05-18 15:21:12 +0900
commit2b8d93a5d19f03c4d6013565a7d4083552ab4dbe (patch)
tree44b7209b4d766c623a76b1b7290f9dfb88f5cd2a /src
parent8de2ba5d4732cd308faf5de40831d2416c6fc45b (diff)
ecore_imf: Add multiline hint in input hint
@feature
Diffstat (limited to 'src')
-rw-r--r--src/lib/ecore_imf/Ecore_IMF.h1
-rw-r--r--src/lib/edje/edje_entry.c4
-rw-r--r--src/modules/ecore_imf/wayland/wayland_imcontext.c5
3 files changed, 10 insertions, 0 deletions
diff --git a/src/lib/ecore_imf/Ecore_IMF.h b/src/lib/ecore_imf/Ecore_IMF.h
index 5e9766cf38..3c7eae7c8c 100644
--- a/src/lib/ecore_imf/Ecore_IMF.h
+++ b/src/lib/ecore_imf/Ecore_IMF.h
@@ -356,6 +356,7 @@ typedef enum
356 ECORE_IMF_INPUT_HINT_NONE = 0, /**< No active hints @since 1.12 */ 356 ECORE_IMF_INPUT_HINT_NONE = 0, /**< No active hints @since 1.12 */
357 ECORE_IMF_INPUT_HINT_AUTO_COMPLETE = 1 << 0, /**< Suggest word auto completion @since 1.12 */ 357 ECORE_IMF_INPUT_HINT_AUTO_COMPLETE = 1 << 0, /**< Suggest word auto completion @since 1.12 */
358 ECORE_IMF_INPUT_HINT_SENSITIVE_DATA = 1 << 1, /**< Typed text should not be stored. @since 1.12 */ 358 ECORE_IMF_INPUT_HINT_SENSITIVE_DATA = 1 << 1, /**< Typed text should not be stored. @since 1.12 */
359 ECORE_IMF_INPUT_HINT_MULTILINE = 1 << 2, /**< Multiline text @since 1.18 */
359} Ecore_IMF_Input_Hints; 360} Ecore_IMF_Input_Hints;
360 361
361enum 362enum
diff --git a/src/lib/edje/edje_entry.c b/src/lib/edje/edje_entry.c
index 44c68ab901..811af394a9 100644
--- a/src/lib/edje/edje_entry.c
+++ b/src/lib/edje/edje_entry.c
@@ -2742,6 +2742,10 @@ _edje_entry_real_part_init(Edje *ed, Edje_Real_Part *rp)
2742 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ? 2742 rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD ?
2743 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL); 2743 ECORE_IMF_INPUT_MODE_INVISIBLE : ECORE_IMF_INPUT_MODE_FULL);
2744 2744
2745 if (rp->part->multiline)
2746 ecore_imf_context_input_hint_set(en->imf_context,
2747 ecore_imf_context_input_hint_get(en->imf_context) | ECORE_IMF_INPUT_HINT_MULTILINE);
2748
2745 if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD) 2749 if (rp->part->entry_mode == EDJE_ENTRY_EDIT_MODE_PASSWORD)
2746 ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET); 2750 ecore_imf_context_input_panel_language_set(en->imf_context, ECORE_IMF_INPUT_PANEL_LANG_ALPHABET);
2747#endif 2751#endif
diff --git a/src/modules/ecore_imf/wayland/wayland_imcontext.c b/src/modules/ecore_imf/wayland/wayland_imcontext.c
index c852c56b9c..9cd5c63485 100644
--- a/src/modules/ecore_imf/wayland/wayland_imcontext.c
+++ b/src/modules/ecore_imf/wayland/wayland_imcontext.c
@@ -1046,6 +1046,11 @@ wayland_im_context_input_hint_set(Ecore_IMF_Context *ctx,
1046 imcontext->content_hint |= WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA; 1046 imcontext->content_hint |= WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA;
1047 else 1047 else
1048 imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA; 1048 imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_SENSITIVE_DATA;
1049
1050 if (input_hints & ECORE_IMF_INPUT_HINT_MULTILINE)
1051 imcontext->content_hint |= WL_TEXT_INPUT_CONTENT_HINT_MULTILINE;
1052 else
1053 imcontext->content_hint &= ~WL_TEXT_INPUT_CONTENT_HINT_MULTILINE;
1049} 1054}
1050 1055
1051EAPI void 1056EAPI void