Delete only parent obejct in popup destructor

* In efl, if parent object deleted then child objects also deleted
  automatically.

Change-Id: I21d8a6084fadb0a9c5b8293b1ee5f562bb9c2ffe

diff --git a/src/framework/ui/popup/popup.cpp b/src/framework/ui/popup/popup.cpp
index 7f815cb..ecfb02a 100644 (file)
--- a/src/framework/ui/popup/popup.cpp
+++ b/src/framework/ui/popup/popup.cpp
@@ -117,8 +117,7 @@ Popup::Popup(int buttonN)
 
 Popup::~Popup()
 {
-       for (auto &obj : m_objects)
-               evas_object_del(obj);
+       evas_object_del(m_win);
 }
 
 void Popup::setHeader(const std::string &header) noexcept
@@ -151,20 +150,6 @@ void Popup::setIcon(const std::string &path) noexcept
 
 void Popup::run(void)
 {
-       m_objects.emplace_back(m_header);
-       m_objects.emplace_back(m_body);
-       m_objects.emplace_back(m_hypertext);
-       m_objects.emplace_back(m_footer);
-       m_objects.emplace_back(m_icon);
-       m_objects.emplace_back(m_subBox);
-       m_objects.emplace_back(m_box);
-
-       for (auto &btn : m_buttons)
-               m_objects.emplace_back(btn);
-
-       m_objects.emplace_back(m_popup);
-       m_objects.emplace_back(m_win);
-
        elm_run();
 }
 

diff --git a/src/framework/ui/popup/popup.h b/src/framework/ui/popup/popup.h
index 8841571..e770006 100644 (file)
--- a/src/framework/ui/popup/popup.h
+++ b/src/framework/ui/popup/popup.h
@@ -78,7 +78,6 @@ public:
        static void btnClickedCb(void *data, Evas_Object *, void *);
        static void hypertextClickedCb(void *data, Evas_Object *, void *);
 
-       std::vector<Evas_Object *> m_objects;
        std::vector<Evas_Object *> m_buttons;
        Evas_Object *m_hypertext;
        std::vector<int> m_types;