From 29c388a35be1b216a4af8f4aa8727060e7edd1d7 Mon Sep 17 00:00:00 2001 From: Alastair Poole Date: Sat, 17 Nov 2018 14:28:59 +0000 Subject: [PATCH] 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 --- src/bin/elementary/test_events.c | 4 ++-- src/lib/elementary/efl_ui_win.c | 2 +- src/lib/elementary/elm_code_widget.c | 8 ++++---- 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) testdata *td = data; char str[1024]; - // FIXME: By default the elm_win object is the focussed object + // FIXME: By default the elm_win object is the focused object // this means that evas callbacks will transfer the KEY_UP/KEY_DOWN events // to the elm_win. So, we get two key_down & two key_up events: // 1. ecore_evas -> evas -> elm_win forward -> here - // 2. ecore_evas -> evas -> focussed obj (elm_win) -> here + // 2. ecore_evas -> evas -> focused obj (elm_win) -> here sprintf(str, "key=%s keyname=%s string=%s compose=%s", 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) if (!evdata || evdata->win_fed) return; - // evas_callbacks will send the event to the focussed object (ie. this win) + // evas_callbacks will send the event to the focused object (ie. this win) if (evas_focus_get(evas_object_evas_get(win)) == win) return; 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 if (line->status != ELM_CODE_STATUS_TYPE_DEFAULT) return line->status; - if (pd->editable && pd->focussed && pd->cursor_line == line->number) + if (pd->editable && pd->focused && pd->cursor_line == line->number) return ELM_CODE_STATUS_TYPE_CURRENT; 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 pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); - if (pd->visible && pd->editable && pd->focussed && pd->cursor_line == number) + if (pd->visible && pd->editable && pd->focused && pd->cursor_line == number) { if (pd->cursor_col + gutter - 1 >= (unsigned int) w) return; @@ -1850,7 +1850,7 @@ _elm_code_widget_focused_event_cb(void *data, Evas_Object *obj, widget = (Elm_Code_Widget *)data; pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); - pd->focussed = EINA_TRUE; + pd->focused = EINA_TRUE; if (pd->cursor_rect) elm_layout_signal_emit(pd->cursor_rect, "elm,action,focus", "elm"); @@ -1867,7 +1867,7 @@ _elm_code_widget_unfocused_event_cb(void *data, Evas_Object *obj, widget = (Elm_Code_Widget *)data; pd = efl_data_scope_get(widget, ELM_CODE_WIDGET_CLASS); - pd->focussed = EINA_FALSE; + pd->focused = EINA_FALSE; if (pd->cursor_rect) elm_layout_signal_emit(pd->cursor_rect, "elm,action,unfocus", "elm"); 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 unsigned int cursor_line, cursor_col; Evas_Object *cursor_rect; - Eina_Bool visible, editable, focussed; + Eina_Bool visible, editable, focused; Eina_Bool show_line_numbers; unsigned int line_width_marker, tabstop; Eina_Bool show_whitespace, tab_inserts_spaces;