summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWooHyun Jung <wh0705.jung@samsung.com>2013-03-13 14:47:31 +0900
committerWooHyun Jung <wh0705.jung@samsung.com>2013-03-13 14:47:31 +0900
commite43b43f59f45841968c6295f01c14e0d7151407c (patch)
tree8481c0d12a20fac3e6914b9fad4e46bcec6dd07b
parent82bd0d96489bc643a7e3c362cf2dbe7d94feeb2f (diff)
List : Focus_next should be executed only when access mode is enabled.
-rw-r--r--ChangeLog4
-rw-r--r--NEWS1
-rw-r--r--src/lib/elm_list.c19
3 files changed, 23 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index f5384e2ed..38bbf8b57 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -770,3 +770,7 @@
7702013-03-11 Tom Hacohen (TAsn) 7702013-03-11 Tom Hacohen (TAsn)
771 771
772 * Entry: Fixed a bug with text appending. 772 * Entry: Fixed a bug with text appending.
773
7742013-03-13 WooHyun Jung
775
776 * List : Focus_next should be executed only when access mode is enabled.
diff --git a/NEWS b/NEWS
index 1b0a681b4..c8649096b 100644
--- a/NEWS
+++ b/NEWS
@@ -23,6 +23,7 @@ Fixes:
23 * Fix scroller acceleration bug. It was accelerated even it's scrolled after finishing the previous scroll. This happens with page scroll enabled. 23 * Fix scroller acceleration bug. It was accelerated even it's scrolled after finishing the previous scroll. This happens with page scroll enabled.
24 * Fix initial value of the spinner on the first mouse move. 24 * Fix initial value of the spinner on the first mouse move.
25 * Entry: Fixed a bug with text appending. 25 * Entry: Fixed a bug with text appending.
26 * List : Focus_next should be executed only when access mode is enabled.
26 27
27Elementary 1.7.5 28Elementary 1.7.5
28 29
diff --git a/src/lib/elm_list.c b/src/lib/elm_list.c
index 9f85e096e..82dfb98a2 100644
--- a/src/lib/elm_list.c
+++ b/src/lib/elm_list.c
@@ -1481,6 +1481,19 @@ _elm_list_smart_focus_next(const Evas_Object *obj,
1481} 1481}
1482 1482
1483static void 1483static void
1484_access_hook(Evas_Object *obj, Eina_Bool is_access)
1485{
1486 ELM_LIST_CHECK(obj);
1487 ELM_LIST_DATA_GET(obj, sd);
1488
1489 if (is_access)
1490 ELM_WIDGET_CLASS(ELM_WIDGET_DATA(sd)->api)->focus_next =
1491 _elm_list_smart_focus_next;
1492 else
1493 ELM_WIDGET_CLASS(ELM_WIDGET_DATA(sd)->api)->focus_next = NULL;
1494}
1495
1496static void
1484_elm_list_smart_add(Evas_Object *obj) 1497_elm_list_smart_add(Evas_Object *obj)
1485{ 1498{
1486 Evas_Coord minw, minh; 1499 Evas_Coord minw, minh;
@@ -1642,12 +1655,16 @@ _elm_list_smart_set_user(Elm_List_Smart_Class *sc)
1642 1655
1643 ELM_WIDGET_CLASS(sc)->sub_object_del = _elm_list_smart_sub_object_del; 1656 ELM_WIDGET_CLASS(sc)->sub_object_del = _elm_list_smart_sub_object_del;
1644 ELM_WIDGET_CLASS(sc)->on_focus = _elm_list_smart_on_focus; 1657 ELM_WIDGET_CLASS(sc)->on_focus = _elm_list_smart_on_focus;
1645 ELM_WIDGET_CLASS(sc)->focus_next = _elm_list_smart_focus_next; 1658 ELM_WIDGET_CLASS(sc)->focus_next = NULL;
1646 ELM_WIDGET_CLASS(sc)->focus_direction = NULL; 1659 ELM_WIDGET_CLASS(sc)->focus_direction = NULL;
1647 ELM_WIDGET_CLASS(sc)->theme = _elm_list_smart_theme; 1660 ELM_WIDGET_CLASS(sc)->theme = _elm_list_smart_theme;
1648 ELM_WIDGET_CLASS(sc)->disable = _elm_list_smart_disable; 1661 ELM_WIDGET_CLASS(sc)->disable = _elm_list_smart_disable;
1649 ELM_WIDGET_CLASS(sc)->event = _elm_list_smart_event; 1662 ELM_WIDGET_CLASS(sc)->event = _elm_list_smart_event;
1650 ELM_WIDGET_CLASS(sc)->translate = _elm_list_smart_translate; 1663 ELM_WIDGET_CLASS(sc)->translate = _elm_list_smart_translate;
1664 ELM_WIDGET_CLASS(sc)->access = _access_hook;
1665
1666 if (_elm_config->access_mode == ELM_ACCESS_MODE_ON)
1667 ELM_WIDGET_CLASS(sc)->focus_next = _elm_list_smart_focus_next;
1651 1668
1652 ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_list_smart_sizing_eval; 1669 ELM_LAYOUT_CLASS(sc)->sizing_eval = _elm_list_smart_sizing_eval;
1653} 1670}