diff options
author | junkyu han <junkyu.han@samsung.com> | 2016-12-11 23:13:42 +0900 |
---|---|---|
committer | junkyu han <junkyu.han@samsung.com> | 2016-12-11 23:14:30 +0900 |
commit | 3a8ca248b33108178990e369cd7145f87b064d73 (patch) | |
tree | 955e540f3c9e6ecc458989dcac0aff69a5061abb | |
parent | 808f390ab835ebd0914cd47c06309c176ff6ba0f (diff) | |
parent | 7609f6d639c6e7a3c360ac6c5d8a933ea6f06beb (diff) | |
download | w3-home-3a8ca248b33108178990e369cd7145f87b064d73.tar.gz w3-home-3a8ca248b33108178990e369cd7145f87b064d73.tar.bz2 w3-home-3a8ca248b33108178990e369cd7145f87b064d73.zip |
Merge branch 'tizen' into tizen_3.0 "Add button for click event"submit/tizen_3.0/20161211.221147
Change-Id: Ief8372f1e1e71bae7e02d4861db325266fc49378
-rw-r--r-- | home/include/scroller.h | 2 | ||||
-rwxr-xr-x | home/src/edit.c | 13 | ||||
-rwxr-xr-x | home/src/page.c | 9 |
3 files changed, 13 insertions, 11 deletions
diff --git a/home/include/scroller.h b/home/include/scroller.h index 5b5ad14..64835d4 100644 --- a/home/include/scroller.h +++ b/home/include/scroller.h @@ -136,5 +136,5 @@ extern void scroller_restore_inner_focus(Evas_Object *scroller); extern void scroller_reorder_with_list(Evas_Object *scroller, Eina_List *list, page_direction_e page_direction); extern void scroller_add_index_hide_timer(Evas_Object *scroller); extern void scroller_remove_index_hide_timer(Evas_Object *scroller); -extern void scroller_update_access_widget_name(Evas_Object *scroller); +extern void scroller_update_access_widget_description(Evas_Object *scroller); #endif /* __W_HOME_SCROLLER_H__ */ diff --git a/home/src/edit.c b/home/src/edit.c index c354e71..8327b6d 100755 --- a/home/src/edit.c +++ b/home/src/edit.c @@ -604,12 +604,6 @@ static void _up_cb(void *data, Evas *e, Evas_Object *obj, void *event_info) scroller_enable_focus_on_scroll(page_info->scroller); scroller_enable_index_on_scroll(page_info->scroller); - if (evas_object_data_del(page_info->scroller, PRIVATE_DATA_KEY_EDIT_ITEM_IS_MOVED) - && main_get_info()->is_tts) - { - elm_access_say(_("IDS_TTS_BODY_ITEM_MOVED")); - } - elm_object_signal_emit(page_info->layout, "hide", "checker"); elm_object_signal_emit(page_info->page_inner, "show", "del"); @@ -927,7 +921,6 @@ HAPI void edit_change_focus(Evas_Object *edit_scroller, Evas_Object *page_curren if (!unfocusable) { elm_object_signal_emit(focused_page_info->page_inner, "deselect", "cover"); elm_object_signal_emit(focused_page_info->page_inner, "deselect", "line"); - elm_object_signal_emit(focused_page_info->page_inner, "hide", "del"); } elm_object_signal_emit(focused_page_info->page_inner, "enable", "blocker"); } @@ -940,9 +933,6 @@ OUT: /* Focusable page */ elm_object_signal_emit(page_info->page_inner, "select", "cover"); elm_object_signal_emit(page_info->page_inner, "select", "line"); - if (page_info->removable) { - elm_object_signal_emit(page_info->page_inner, "show", "del"); - } } @@ -1708,6 +1698,9 @@ Evas_Object *edit_create_proxy_page(Evas_Object *edit_scroller, Evas_Object *rea return NULL; } elm_object_signal_emit(proxy_page_info->page_inner, "enable", "blocker"); + if (proxy_page_info->removable) { + elm_object_signal_emit(proxy_page_info->page_inner, "show", "del"); + } /* Edit Access Object */ access_info_t *access_info = NULL; diff --git a/home/src/page.c b/home/src/page.c index 5caf1ed..acaa8af 100755 --- a/home/src/page.c +++ b/home/src/page.c @@ -263,6 +263,15 @@ HAPI Evas_Object *page_create(Evas_Object *scroller evas_object_data_set(page_inner, PRIVATE_DATA_KEY_PAGE_ACCESS_OBJECT, NULL); + focus = elm_button_add(page_inner); + retv_if(!focus, NULL); + + elm_object_theme_set(focus, main_get_info()->theme); + elm_object_style_set(focus, "transparent"); + elm_object_part_content_set(page_inner, "focus", focus); + evas_object_size_hint_weight_set(focus, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); + elm_atspi_accessible_can_highlight_set(focus, EINA_FALSE); + page_info->width = width; page_info->height = height; |