From b556d1f20b321552e6afed73e4dc676b79d7103a Mon Sep 17 00:00:00 2001 From: seoz Date: Thu, 25 Aug 2011 17:19:22 +0000 Subject: [PATCH] elm list/gengrid: Fixed typo in internal functions and variables. hilight -> highlight. Hilight is a common mis-spelling of highlight. http://en.wiktionary.org/wiki/hilight git-svn-id: svn+ssh://svn.enlightenment.org/var/svn/e/trunk/elementary@62830 7cbeb6ba-43b4-40fd-8cce-4c39aea84d33 --- src/lib/elm_gengrid.c | 22 +++++++++++----------- src/lib/elm_list.c | 26 +++++++++++++------------- 2 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/lib/elm_gengrid.c b/src/lib/elm_gengrid.c index 965327f..1a09a2b 100644 --- a/src/lib/elm_gengrid.c +++ b/src/lib/elm_gengrid.c @@ -53,7 +53,7 @@ Eina_Bool display_only : 1; Eina_Bool disabled : 1; Eina_Bool selected : 1; - Eina_Bool hilighted : 1; + Eina_Bool highlighted : 1; Eina_Bool moving : 1; }; @@ -101,7 +101,7 @@ struct _Pan }; static const char *widtype = NULL; -static void _item_hilight(Elm_Gengrid_Item *item); +static void _item_highlight(Elm_Gengrid_Item *item); static void _item_unrealize(Elm_Gengrid_Item *item); static void _item_select(Elm_Gengrid_Item *item); static void _item_unselect(Elm_Gengrid_Item *item); @@ -786,7 +786,7 @@ _mouse_down(void *data, if (ev->event_flags & EVAS_EVENT_FLAG_ON_HOLD) item->wd->on_hold = EINA_TRUE; else item->wd->on_hold = EINA_FALSE; item->wd->wasselected = item->selected; - _item_hilight(item); + _item_highlight(item); if (ev->flags & EVAS_BUTTON_DOUBLE_CLICK) { evas_object_smart_callback_call(item->wd->self, SIG_CLICKED_DOUBLE, item); @@ -858,7 +858,7 @@ _mouse_up(void *data, { if (!item->selected) { - _item_hilight(item); + _item_highlight(item); _item_select(item); } else _item_unselect(item); @@ -878,17 +878,17 @@ _mouse_up(void *data, EINA_LIST_FOREACH_SAFE(item->wd->selected, l, l_next, item2) if (item2 != item) _item_unselect(item2); } - _item_hilight(item); + _item_highlight(item); _item_select(item); } } static void -_item_hilight(Elm_Gengrid_Item *item) +_item_highlight(Elm_Gengrid_Item *item) { - if ((item->wd->no_select) || (item->delete_me) || (item->hilighted)) return; + if ((item->wd->no_select) || (item->delete_me) || (item->highlighted)) return; edje_object_signal_emit(item->base.view, "elm,state,selected", "elm"); - item->hilighted = EINA_TRUE; + item->highlighted = EINA_TRUE; } static void @@ -1341,9 +1341,9 @@ call: static void _item_unselect(Elm_Gengrid_Item *item) { - if ((item->delete_me) || (!item->hilighted)) return; + if ((item->delete_me) || (!item->highlighted)) return; edje_object_signal_emit(item->base.view, "elm,state,unselected", "elm"); - item->hilighted = EINA_FALSE; + item->highlighted = EINA_FALSE; if (item->selected) { item->selected = EINA_FALSE; @@ -2133,7 +2133,7 @@ elm_gengrid_item_selected_set(Elm_Gengrid_Item *item, while (wd->selected) _item_unselect(wd->selected->data); } - _item_hilight(item); + _item_highlight(item); _item_select(item); } else diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c index f80bd63..a2c87ba 100644 --- a/src/lib/elm_list.c +++ b/src/lib/elm_list.c @@ -46,7 +46,7 @@ struct _Elm_List_Item Eina_Bool is_separator : 1; Eina_Bool fixed : 1; Eina_Bool selected : 1; - Eina_Bool hilighted : 1; + Eina_Bool highlighted : 1; Eina_Bool dummy_icon : 1; Eina_Bool dummy_end : 1; }; @@ -493,7 +493,7 @@ _disable_hook(Evas_Object *obj) _signal_emit_hook(obj, "elm,state,disabled", "elm"); elm_widget_scroll_freeze_push(obj); elm_widget_scroll_hold_push(obj); - /* FIXME: if we get to have a way to only un-hilight items + /* FIXME: if we get to have a way to only un-highlight items * in the future, keeping them selected... */ _deselect_all_items(wd); } @@ -687,7 +687,7 @@ _sub_del(void *data __UNUSED__, Evas_Object *obj, void *event_info) } static void -_item_hilight(Elm_List_Item *it) +_item_highlight(Elm_List_Item *it) { Evas_Object *obj = it->base.widget; Widget_Data *wd = elm_widget_data_get(obj); @@ -695,7 +695,7 @@ _item_hilight(Elm_List_Item *it) if (!wd) return; ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); - if (it->hilighted) return; + if (it->highlighted) return; evas_object_ref(obj); _elm_list_walk(wd); @@ -704,7 +704,7 @@ _item_hilight(Elm_List_Item *it) selectraise = edje_object_data_get(it->base.view, "selectraise"); if ((selectraise) && (!strcmp(selectraise, "on"))) evas_object_raise(it->base.view); - it->hilighted = EINA_TRUE; + it->highlighted = EINA_TRUE; _elm_list_unwalk(wd); evas_object_unref(obj); @@ -747,7 +747,7 @@ _item_unselect(Elm_List_Item *it) if (!wd) return; ELM_LIST_ITEM_CHECK_DELETED_RETURN(it); - if (!it->hilighted) return; + if (!it->highlighted) return; evas_object_ref(obj); _elm_list_walk(wd); @@ -760,7 +760,7 @@ _item_unselect(Elm_List_Item *it) if ((stacking) && (!strcmp(stacking, "below"))) evas_object_lower(it->base.view); } - it->hilighted = EINA_FALSE; + it->highlighted = EINA_FALSE; if (it->selected) { it->selected = EINA_FALSE; @@ -915,7 +915,7 @@ _mouse_down(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void evas_object_ref(obj2); _elm_list_walk(wd); - _item_hilight(it); + _item_highlight(it); wd->longpressed = EINA_FALSE; if (it->long_timer) ecore_timer_del(it->long_timer); it->long_timer = ecore_timer_add(_elm_config->longpress_timeout, _long_press, it); @@ -982,7 +982,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void * { if (!it->selected) { - _item_hilight(it); + _item_highlight(it); _item_select(it); } else _item_unselect(it); @@ -993,7 +993,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void * { while (wd->selected) _item_unselect(wd->selected->data); - _item_hilight(it); + _item_highlight(it); _item_select(it); } else @@ -1003,7 +1003,7 @@ _mouse_up(void *data, Evas *evas __UNUSED__, Evas_Object *obj __UNUSED__, void * EINA_LIST_FOREACH_SAFE(wd->selected, l, l_next, it2) if (it2 != it) _item_unselect(it2); - _item_hilight(it); + _item_highlight(it); _item_select(it); } } @@ -1218,7 +1218,7 @@ _fix_items(Evas_Object *obj) evas_object_size_hint_min_set(it->base.view, mw, mh); evas_object_show(it->base.view); } - if ((it->selected) || (it->hilighted)) + if ((it->selected) || (it->highlighted)) { const char *selectraise; @@ -1682,7 +1682,7 @@ elm_list_item_selected_set(Elm_List_Item *it, Eina_Bool selected) while (wd->selected) _item_unselect(wd->selected->data); } - _item_hilight(it); + _item_highlight(it); _item_select(it); } else -- 2.7.4