diff options
| author | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-06-20 14:51:55 +0200 |
|---|---|---|
| committer | Marcel Hollerbach <mail@marcel-hollerbach.de> | 2019-06-20 17:24:31 +0200 |
| commit | 6b8900d4fc694ac714ba0b04dacb7b5f4968496c (patch) | |
| tree | 1e3a16903f1a258e744c7d1b8678363c14c8321b | |
| parent | 1e86c2bf9367d21eab70a0fa29762b98e39c7c03 (diff) | |
| download | efl-6b8900d4fc694ac714ba0b04dacb7b5f4968496c.tar.gz | |
efl_input_key: compose -> compose_string
rename this property, as this name was considered better.
ref T7964
Reviewed-by: Xavi Artigas <xavierartigas@yahoo.es>
Differential Revision: https://phab.enlightenment.org/D9141
| -rw-r--r-- | src/bin/elementary/test_events.c | 2 | ||||
| -rw-r--r-- | src/lib/evas/canvas/efl_input_key.c | 4 | ||||
| -rw-r--r-- | src/lib/evas/canvas/efl_input_key.eo | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index 0e274e4456..614b9fa2ac 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c @@ -59,7 +59,7 @@ _key_down(void *data, const Efl_Event *ev) efl_input_key_get(ev->info), efl_input_key_name_get(ev->info), efl_input_key_string_get(ev->info), - efl_input_key_compose_get(ev->info)); + efl_input_key_compose_string_get(ev->info)); elm_object_text_set(td->text, str); if (!efl_input_fake_get(ev->info)) diff --git a/src/lib/evas/canvas/efl_input_key.c b/src/lib/evas/canvas/efl_input_key.c index 11af16b0a2..8a55da6b7d 100644 --- a/src/lib/evas/canvas/efl_input_key.c +++ b/src/lib/evas/canvas/efl_input_key.c @@ -119,13 +119,13 @@ _efl_input_key_string_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd) } EOLIAN static void -_efl_input_key_compose_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val) +_efl_input_key_compose_string_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val) { eina_stringshare_replace(&pd->compose, val); } EOLIAN static const char * -_efl_input_key_compose_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd) +_efl_input_key_compose_string_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd) { return pd->compose; } diff --git a/src/lib/evas/canvas/efl_input_key.eo b/src/lib/evas/canvas/efl_input_key.eo index 2f549f79af..a14e81c64a 100644 --- a/src/lib/evas/canvas/efl_input_key.eo +++ b/src/lib/evas/canvas/efl_input_key.eo @@ -32,7 +32,7 @@ class @beta Efl.Input.Key extends Efl.Object implements Efl.Input.Event, Efl.Inp val: string; [[Visible string from key press in UTF8]] } } - @property compose { + @property compose_string { [[A UTF8 string if this keystroke has modified a string in the middle of being composed. |