diff options
author | Alastair Poole <netstar@gmail.com> | 2018-11-17 14:28:59 +0000 |
---|---|---|
committer | Christopher Michael <cp.michael@samsung.com> | 2018-12-06 12:06:17 -0500 |
commit | b985a3b0f9ab1c5bafd50d51f79fc51acd5838c1 (patch) | |
tree | b72afec139b363e77b76484e28bd27e3ddc27a75 | |
parent | b8f96109082e775f48ae44e8c2d514ba6e54c84e (diff) |
efl: fix misspelt focused in API and documents.
Fix spelling in elm_code API and other documents too where this occurs.
Differential Revision: https://phab.enlightenment.org/D7299
-rw-r--r-- | src/bin/elementary/test_events.c | 4 | ||||
-rw-r--r-- | src/lib/elementary/efl_ui_win.c | 2 | ||||
-rw-r--r-- | src/lib/elementary/elm_code_widget.c | 8 | ||||
-rw-r--r-- | src/lib/elementary/elm_code_widget_private.h | 2 |
4 files changed, 8 insertions, 8 deletions
diff --git a/src/bin/elementary/test_events.c b/src/bin/elementary/test_events.c index 661a8107f1..1eba66c2dc 100644 --- a/src/bin/elementary/test_events.c +++ b/src/bin/elementary/test_events.c | |||
@@ -48,11 +48,11 @@ _key_down(void *data, const Efl_Event *ev) | |||
48 | testdata *td = data; | 48 | testdata *td = data; |
49 | char str[1024]; | 49 | char str[1024]; |
50 | 50 | ||
51 | // FIXME: By default the elm_win object is the focussed object | 51 | // FIXME: By default the elm_win object is the focused object |
52 | // this means that evas callbacks will transfer the KEY_UP/KEY_DOWN events | 52 | // this means that evas callbacks will transfer the KEY_UP/KEY_DOWN events |
53 | // to the elm_win. So, we get two key_down & two key_up events: | 53 | // to the elm_win. So, we get two key_down & two key_up events: |
54 | // 1. ecore_evas -> evas -> elm_win forward -> here | 54 | // 1. ecore_evas -> evas -> elm_win forward -> here |
55 | // 2. ecore_evas -> evas -> focussed obj (elm_win) -> here | 55 | // 2. ecore_evas -> evas -> focused obj (elm_win) -> here |
56 | 56 | ||
57 | sprintf(str, "key=%s keyname=%s string=%s compose=%s", | 57 | sprintf(str, "key=%s keyname=%s string=%s compose=%s", |
58 | efl_input_key_get(ev->info), | 58 | efl_input_key_get(ev->info), |
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c index 1e12b46702..0d33fe31f0 100644 --- a/src/lib/elementary/efl_ui_win.c +++ b/src/lib/elementary/efl_ui_win.c | |||
@@ -1799,7 +1799,7 @@ _evas_event_key_cb(void *data, const Efl_Event *ev) | |||
1799 | if (!evdata || evdata->win_fed) | 1799 | if (!evdata || evdata->win_fed) |
1800 | return; | 1800 | return; |
1801 | 1801 | ||
1802 | // evas_callbacks will send the event to the focussed object (ie. this win) | 1802 | // evas_callbacks will send the event to the focused object (ie. this win) |
1803 | if (evas_focus_get(evas_object_evas_get(win)) == win) | 1803 | if (evas_focus_get(evas_object_evas_get(win)) == win) |
1804 | return; | 1804 | return; |
1805 | 1805 | ||
diff --git a/src/lib/elementary/elm_code_widget.c b/src/lib/elementary/elm_code_widget.c index af10ec0496..68738c10e0 100644 --- a/src/lib/elementary/elm_code_widget.c +++ b/src/lib/elementary/elm_code_widget.c | |||
@@ -161,7 +161,7 @@ _elm_code_widget_status_type_get(Elm_Code_Widget *widget, Elm_Code_Line *line, u | |||
161 | if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT) | 161 | if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT) |
162 | return line->status; | 162 | return line->status; |
163 | 163 | ||
164 | if (pd->editable && pd->focussed && pd->cursor_line == line->number) | 164 | if (pd->editable && pd->focused && pd->cursor_line == line->number) |
165 | return ELM_CODE_STATUS_TYPE_CURRENT; | 165 | return ELM_CODE_STATUS_TYPE_CURRENT; |
166 | 166 | ||
167 | if (pd->line_width_marker > 0 && pd->line_width_marker == col-1) | 167 | if (pd->line_width_marker > 0 && pd->line_width_marker == col-1) |
@@ -338,7 +338,7 @@ _elm_code_widget_fill_cursor(Elm_Code_Widget *widget, unsigned int number, int g | |||
338 | 338 | ||
339 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); | 339 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); |
340 | 340 | ||
341 | if (pd->visible && pd->editable && pd->focussed && pd->cursor_line == number) | 341 | if (pd->visible && pd->editable && pd->focused && pd->cursor_line == number) |
342 | { | 342 | { |
343 | if (pd->cursor_col + gutter - 1 >= (unsigned int) w) | 343 | if (pd->cursor_col + gutter - 1 >= (unsigned int) w) |
344 | return; | 344 | return; |
@@ -1850,7 +1850,7 @@ _elm_code_widget_focused_event_cb(void *data, Evas_Object *obj, | |||
1850 | widget = (Elm_Code_Widget *)data; | 1850 | widget = (Elm_Code_Widget *)data; |
1851 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); | 1851 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); |
1852 | 1852 | ||
1853 | pd->focussed = EINA_TRUE; | 1853 | pd->focused = EINA_TRUE; |
1854 | if (pd->cursor_rect) | 1854 | if (pd->cursor_rect) |
1855 | elm_layout_signal_emit(pd->cursor_rect, "elm,action,focus", "elm"); | 1855 | elm_layout_signal_emit(pd->cursor_rect, "elm,action,focus", "elm"); |
1856 | 1856 | ||
@@ -1867,7 +1867,7 @@ _elm_code_widget_unfocused_event_cb(void *data, Evas_Object *obj, | |||
1867 | widget = (Elm_Code_Widget *)data; | 1867 | widget = (Elm_Code_Widget *)data; |
1868 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); | 1868 | pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); |
1869 | 1869 | ||
1870 | pd->focussed = EINA_FALSE; | 1870 | pd->focused = EINA_FALSE; |
1871 | if (pd->cursor_rect) | 1871 | if (pd->cursor_rect) |
1872 | elm_layout_signal_emit(pd->cursor_rect, "elm,action,unfocus", "elm"); | 1872 | elm_layout_signal_emit(pd->cursor_rect, "elm,action,unfocus", "elm"); |
1873 | 1873 | ||
diff --git a/src/lib/elementary/elm_code_widget_private.h b/src/lib/elementary/elm_code_widget_private.h index ec1e53dc35..3398ad370f 100644 --- a/src/lib/elementary/elm_code_widget_private.h +++ b/src/lib/elementary/elm_code_widget_private.h | |||
@@ -32,7 +32,7 @@ typedef struct | |||
32 | unsigned int cursor_line, cursor_col; | 32 | unsigned int cursor_line, cursor_col; |
33 | Evas_Object *cursor_rect; | 33 | Evas_Object *cursor_rect; |
34 | 34 | ||
35 | Eina_Bool visible, editable, focussed; | 35 | Eina_Bool visible, editable, focused; |
36 | Eina_Bool show_line_numbers; | 36 | Eina_Bool show_line_numbers; |
37 | unsigned int line_width_marker, tabstop; | 37 | unsigned int line_width_marker, tabstop; |
38 | Eina_Bool show_whitespace, tab_inserts_spaces; | 38 | Eina_Bool show_whitespace, tab_inserts_spaces; |