summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorami <singh.amitesh@gmail.com>2013-11-30 15:34:55 +0900
committerDaniel Juyung Seo <juyung.seo@samsung.com>2013-11-30 15:34:55 +0900
commit6a401bb8d803ff745869b998097759973c947c2b (patch)
tree72586c9e134ceef60e17b00a0b917131312336da /src
parentf4baea0ebde0d3048a3e8f7bd1a149eeeea00278 (diff)
[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
Diffstat (limited to 'src')
-rw-r--r--src/bin/test_hoversel.c1
-rw-r--r--src/lib/elc_hoversel.c34
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 *
271 _hoversel_dismissed_cb, NULL); 271 _hoversel_dismissed_cb, NULL);
272 elm_box_pack_end(bx, hoversel); 272 elm_box_pack_end(bx, hoversel);
273 evas_object_show(hoversel); 273 evas_object_show(hoversel);
274 elm_object_focus_set(hoversel, EINA_TRUE);
274 275
275 hoversel = elm_hoversel_add(win); 276 hoversel = elm_hoversel_add(win);
276 elm_hoversel_horizontal_set(hoversel, EINA_TRUE); 277 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,
569} 569}
570 570
571static void 571static void
572_elm_hoversel_smart_focus_direction_manager_is(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
573{
574 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
575 if(ret) *ret = EINA_TRUE;
576}
577
578static void
579_elm_hoversel_smart_focus_direction(Eo *obj EINA_UNUSED, void *_pd EINA_UNUSED, va_list *list)
580{
581 Elm_Hoversel_Smart_Data *sd = _pd;
582 Evas_Object *base = va_arg(*list, Evas_Object *);
583 double degree = va_arg(*list, double);
584 Evas_Object **direction = va_arg(*list, Evas_Object **);
585 double *weight = va_arg(*list, double *);
586 Eina_Bool *ret = va_arg(*list, Eina_Bool *);
587 if (ret) *ret = EINA_FALSE;
588 Eina_Bool int_ret;
589 Eina_List *l = NULL;
590 void *(*list_data_get)(const Eina_List *list);
591
592 if (!sd || !sd->hover) return;
593
594 list_data_get = eina_list_data_get;
595 l = eina_list_append(l, sd->hover);
596
597 int_ret = elm_widget_focus_list_direction_get
598 (obj, base, l, list_data_get, degree, direction, weight);
599 if (ret) *ret = int_ret;
600 eina_list_free(l);
601}
602
603static void
604_elm_hoversel_smart_event(Eo *obj, void *_pd, va_list *list) 572_elm_hoversel_smart_event(Eo *obj, void *_pd, va_list *list)
605{ 573{
606 Evas_Object *src = va_arg(*list, Evas_Object *); 574 Evas_Object *src = va_arg(*list, Evas_Object *);
@@ -667,8 +635,6 @@ _class_constructor(Eo_Class *klass)
667 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_hoversel_smart_theme), 635 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_THEME), _elm_hoversel_smart_theme),
668 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate), 636 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_TRANSLATE), _elm_hoversel_smart_translate),
669 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set), 637 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_PARENT_SET), _elm_hoversel_smart_parent_set),
670 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION_MANAGER_IS), _elm_hoversel_smart_focus_direction_manager_is),
671 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_FOCUS_DIRECTION), _elm_hoversel_smart_focus_direction),
672 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event), 638 EO_OP_FUNC(ELM_WIDGET_ID(ELM_WIDGET_SUB_ID_EVENT), _elm_hoversel_smart_event),
673 639
674 EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_hoversel_smart_admits_autorepeat_get), 640 EO_OP_FUNC(ELM_OBJ_BUTTON_ID(ELM_OBJ_BUTTON_SUB_ID_ADMITS_AUTOREPEAT_GET), _elm_hoversel_smart_admits_autorepeat_get),