summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-20 14:51:55 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-06-20 17:24:31 +0200
commit6b8900d4fc694ac714ba0b04dacb7b5f4968496c (patch)
tree1e3a16903f1a258e744c7d1b8678363c14c8321b
parent1e86c2bf9367d21eab70a0fa29762b98e39c7c03 (diff)
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.c2
-rw-r--r--src/lib/evas/canvas/efl_input_key.c4
-rw-r--r--src/lib/evas/canvas/efl_input_key.eo2
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)
59 efl_input_key_get(ev->info), 59 efl_input_key_get(ev->info),
60 efl_input_key_name_get(ev->info), 60 efl_input_key_name_get(ev->info),
61 efl_input_key_string_get(ev->info), 61 efl_input_key_string_get(ev->info),
62 efl_input_key_compose_get(ev->info)); 62 efl_input_key_compose_string_get(ev->info));
63 elm_object_text_set(td->text, str); 63 elm_object_text_set(td->text, str);
64 64
65 if (!efl_input_fake_get(ev->info)) 65 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)
119} 119}
120 120
121EOLIAN static void 121EOLIAN static void
122_efl_input_key_compose_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val) 122_efl_input_key_compose_string_set(Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd, const char *val)
123{ 123{
124 eina_stringshare_replace(&pd->compose, val); 124 eina_stringshare_replace(&pd->compose, val);
125} 125}
126 126
127EOLIAN static const char * 127EOLIAN static const char *
128_efl_input_key_compose_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd) 128_efl_input_key_compose_string_get(const Eo *obj EINA_UNUSED, Efl_Input_Key_Data *pd)
129{ 129{
130 return pd->compose; 130 return pd->compose;
131} 131}
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
32 val: string; [[Visible string from key press in UTF8]] 32 val: string; [[Visible string from key press in UTF8]]
33 } 33 }
34 } 34 }
35 @property compose { 35 @property compose_string {
36 [[A UTF8 string if this keystroke has modified a string in the middle 36 [[A UTF8 string if this keystroke has modified a string in the middle
37 of being composed. 37 of being composed.
38 38