diff options
| author | ami <singh.amitesh@gmail.com> | 2013-11-30 15:34:55 +0900 |
|---|---|---|
| committer | Daniel Juyung Seo <juyung.seo@samsung.com> | 2013-11-30 15:34:55 +0900 |
| commit | 6a401bb8d803ff745869b998097759973c947c2b (patch) | |
| tree | 72586c9e134ceef60e17b00a0b917131312336da | |
| parent | f4baea0ebde0d3048a3e8f7bd1a149eeeea00278 (diff) | |
| download | elementary-6a401bb8d803ff745869b998097759973c947c2b.tar.gz | |
[hoversel] - Removed focus_direction since focus_cycle is applied on sd->hover.
Summary: removed focus_direction
Test Plan: elementary_test -> hoversel
Reviewers: seoz, raster
CC: nirajkr
Differential Revision: https://phab.enlightenment.org/D359
| -rw-r--r-- | src/bin/test_hoversel.c | 1 | ||||
| -rw-r--r-- | src/lib/elc_hoversel.c | 34 |
2 files changed, 1 insertions, 34 deletions
diff --git a/src/bin/test_hoversel.c b/src/bin/test_hoversel.c index 25b3de094..473f0504a 100644 --- a/src/bin/test_hoversel.c +++ b/src/bin/test_hoversel.c @@ -271,6 +271,7 @@ test_hoversel_focus(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED, void * _hoversel_dismissed_cb, NULL); elm_box_pack_end(bx, hoversel); evas_object_show(hoversel); + elm_object_focus_set(hoversel, EINA_TRUE); hoversel = elm_hoversel_add(win); elm_hoversel_horizontal_set(hoversel, EINA_TRUE); diff --git a/src/lib/elc_hoversel.c b/src/lib/elc_hoversel.c index 629960607..a210045e6 100644 --- a/src/lib/elc_hoversel.c +++ b/src/lib/elc_hoversel.c @@ -569,38 +569,6 @@ elm_hoversel_item_icon_get(const Elm_Object_Item *it, } static void -_elm_hoversel_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) -{ - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if(ret) *ret = EINA_TRUE; -} - -static void -_elm_hoversel_smart_focus_direction(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list) -{ - Elm_Hoversel_Smart_Data *sd = _pd; - Evas_Object *base = va_arg(*list, Evas_Object *); - double degree = va_arg(*list, double); - Evas_Object **direction = va_arg(*list, Evas_Object **); - double *weight = va_arg(*list, double *); - Eina_Bool *ret = va_arg(*list, Eina_Bool *); - if (ret) *ret = EINA_FALSE; - Eina_Bool int_ret; - Eina_List *l = NULL; - void *(*list_data_get)(const Eina_List *list); - - if (!sd || !sd->hover) return; - - list_data_get = eina_list_data_get; - l = eina_list_append(l, sd->hover); - - int_ret = elm_widget_focus_list_direction_get - (obj, base, l, list_data_get, degree, direction, weight); - if (ret) *ret = int_ret; - eina_list_free(l); -} - -static void _elm_hoversel_smart_event(Eo *obj, void *_pd, va_list *list) { Evas_Object *src = va_arg(*list, Evas_Object *); @@ -667,8 +635,6 @@ _class_constructor(Eo_Class *klass) EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_hoversel_smart_theme), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_hoversel_smart_focus_direction_manager_is), - EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_hoversel_smart_focus_direction), EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event), EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_hoversel_smart_admits_autorepeat_get), |