From 18d49a0d36b06da19d6430886ee44389b86bb16b Mon Sep 17 00:00:00 2001 From: Jaehyun Cho Date: Tue, 2 Apr 2019 16:29:11 +0900 Subject: [PATCH] Revert "test/efl_ui_pager: fix demo" This reverts commit d3bb1a7342b2725c585d90557926e0c433058e50. The commit is reverted to revert the following commits. 74c48f029632d2260816b4cb3de6dbb40a29f040 913a5bff66dd7a58753ccae1474657ec33350e43 The above commits will be restored after release and then d3bb1a7342b2725c585d90557926e0c433058e50 will be also restored. --- src/bin/elementary/test_ui_pager.c | 30 ++++-------------------------- 1 file changed, 4 insertions(+), 26 deletions(-) diff --git a/src/bin/elementary/test_ui_pager.c b/src/bin/elementary/test_ui_pager.c index 32bc1d7..78fb1b5 100644 --- a/src/bin/elementary/test_ui_pager.c +++ b/src/bin/elementary/test_ui_pager.c @@ -36,8 +36,7 @@ typedef enum _Pack_Type { PACK_BEFORE, PACK_AFTER, PACK_AT, - UNPACK_AT, - CLEAR + UNPACK_AT } Pack_Type; typedef struct _Params { @@ -219,7 +218,7 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) Eo *page = NULL, *curr_page; int index, cnt; - if ((param->type != UNPACK_AT) && (param->type != CLEAR)) { + if (param->type != UNPACK_AT) { index = efl_content_count(pager); switch (index % 3) { @@ -261,12 +260,10 @@ static void pack_btn_cb(void *data, const Efl_Event *ev EINA_UNUSED) break; case UNPACK_AT: index = efl_ui_range_value_get(param->unpack_sp); - page = efl_pack_unpack_at(pager, index); + page = efl_pack_content_get(pager, index); + efl_pack_unpack(pager, page); efl_del(page); break; - case CLEAR: - efl_pack_clear(pager); - break; } cnt = efl_content_count(pager); @@ -590,25 +587,6 @@ static void pack_cb(void *data, efl_pack_end(box, in_box2); efl_pack_end(in_box2, btn); efl_pack_end(in_box2, sp2); - - // Clear - pack_param = calloc(1, sizeof(Pack_Params)); - if (!pack_param) return; - - pack_param->pager = pager; - pack_param->pack_sp = sp1; - pack_param->unpack_sp = sp2; - pack_param->unpack_btn = btn; - pack_param->type = CLEAR; - - efl_add(EFL_UI_BUTTON_CLASS, box, - efl_text_set(efl_added, "Clear"), - efl_event_callback_add(efl_added, EFL_UI_EVENT_CLICKED, - pack_btn_cb, pack_param), - efl_event_callback_add(efl_added, EFL_EVENT_DEL, - pack_btn_del_cb, pack_param), - efl_pack_end(box, efl_added)); - } static void current_page_cb(void *data, -- 2.7.4