Delete notification when user press ok on popup

Change-Id: I0de70bbf90191d3617cd907596b62babb047db90
Signed-off-by: jinwoo.shin <jw0227.shin@samsung.com>

diff --git a/include/util.h b/include/util.h
index 97dc643..d6053e0 100644 (file)
--- a/include/util.h
+++ b/include/util.h
@@ -19,7 +19,8 @@
 #ifndef __UTIL_H__
 #define __UTIL_H__
 
-Evas_Object *util_show_notification_popup(Evas_Object *base, notification_h noti);
+Evas_Object *util_show_notification_popup(Evas_Object *base,
+               notification_h noti, bool noti_del);
 void util_clear_notification(void);
 Evas_Object *util_add_icon(Evas_Object *parent, const char *file,
                const char *part);

diff --git a/src/notification_view.c b/src/notification_view.c
index 3f9e622..c65b2ab 100644 (file)
--- a/src/notification_view.c
+++ b/src/notification_view.c
@@ -563,7 +563,7 @@ static void _update(void *view_data, int type, void *data)
                if (!noti)
                        return;
 
-               util_show_notification_popup(priv->base, noti);
+               util_show_notification_popup(priv->base, noti, false);
                break;
        }
 }

diff --git a/src/square_view.c b/src/square_view.c
index 4f3a24a..0d36bf2 100644 (file)
--- a/src/square_view.c
+++ b/src/square_view.c
@@ -433,7 +433,7 @@ static void _button_clicked_cb(int id, void *data, Evas_Object *obj)
                if (!priv || !noti)
                        return;
 
-               util_show_notification_popup(priv->base, noti);
+               util_show_notification_popup(priv->base, noti, true);
                break;
        }
 }

diff --git a/src/util.c b/src/util.c
index 64d7e9e..faf99a4 100644 (file)
--- a/src/util.c
+++ b/src/util.c
@@ -24,6 +24,7 @@
 
 enum _button_id {
        BUTTON_OK,
+       BUTTON_OK_NOTI_DEL,
        BUTTON_CANCEL,
 };
 
@@ -51,19 +52,24 @@ static void _key_up_cb(int id, void *data, Evas *e, Evas_Object *obj,
 
 static void _clicked(int id, void *data, Evas_Object *obj)
 {
+       notification_h noti;
+
        if (!data)
                return;
 
        switch (id) {
+       case BUTTON_OK_NOTI_DEL:
+               noti = evas_object_data_get(data, KEY_NOTI);
+               if (noti)
+                       notification_delete(noti);
        case BUTTON_OK:
-               inputmgr_remove_callback(data, &popup_handler);
                evas_object_del(data);
                break;
        }
 }
 
 Evas_Object *util_show_notification_popup(
-               Evas_Object *base, notification_h noti)
+               Evas_Object *base, notification_h noti, bool noti_del)
 {
        Evas_Object *popup, *btn1;
        char *title = NULL;
@@ -87,8 +93,14 @@ Evas_Object *util_show_notification_popup(
        btn1 = elm_button_add(popup);
        elm_object_text_set(btn1, "OK");
        elm_object_part_content_set(popup, "button1", btn1);
-       inputmgr_add_callback(btn1,
-                       BUTTON_OK, &popup_handler, popup);
+
+       if (noti_del)
+               inputmgr_add_callback(btn1,
+                               BUTTON_OK_NOTI_DEL, &popup_handler, popup);
+       else
+               inputmgr_add_callback(btn1,
+                               BUTTON_OK, &popup_handler, popup);
+
        evas_object_show(btn1);
        elm_object_focus_set(btn1, EINA_TRUE);