[EGIT] [core/efl] master 04/06: Revert "Revert "test/efl_ui_pager: fix demo""

[Jaehyun Cho]

jaehyun pushed a commit to branch master.

http://git.enlightenment.org/core/efl.git/commit/?id=326b1e440a62ec9466c7c884944891caedaf5245

commit 326b1e440a62ec9466c7c884944891caedaf5245
Author: Jaehyun Cho <jae_hyun....@samsung.com>
Date:   Wed Apr 17 10:41:50 2019 +0900

    Revert "Revert "test/efl_ui_pager: fix demo""
    
    This reverts commit f652bf932837846c5911c26992196213780394df.
    
    To restore d3bb1a7342b2725c585d90557926e0c433058e50 which implements
    features during feature freeze period, the revert commit is reverted.
---
 src/bin/elementary/test_ui_pager.c | 30 ++++++++++++++++++++++++++----
 1 file changed, 26 insertions(+), 4 deletions(-)

diff --git a/src/bin/elementary/test_ui_pager.c 
b/src/bin/elementary/test_ui_pager.c
index 78fb1b598e..32bc1d775a 100644
--- a/src/bin/elementary/test_ui_pager.c
+++ b/src/bin/elementary/test_ui_pager.c
@@ -36,7 +36,8 @@ typedef enum _Pack_Type {
    PACK_BEFORE,
    PACK_AFTER,
    PACK_AT,
-   UNPACK_AT
+   UNPACK_AT,
+   CLEAR
 } Pack_Type;
 
 typedef struct _Params {
@@ -218,7 +219,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) {
+   if ((param->type != UNPACK_AT) && (param->type != CLEAR)) {
       index  = efl_content_count(pager);
 
       switch (index % 3) {
@@ -260,10 +261,12 @@ 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_content_get(pager, index);
-         efl_pack_unpack(pager, page);
+         page = efl_pack_unpack_at(pager, index);
          efl_del(page);
          break;
+      case CLEAR:
+         efl_pack_clear(pager);
+         break;
    }
 
    cnt = efl_content_count(pager);
@@ -587,6 +590,25 @@ 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,

--