rimmed pushed a commit to branch master.

http://git.enlightenment.org/tools/eflete.git/commit/?id=ba1d06b014ec02f90432d730c5c9eaf0bd1bb38f

commit ba1d06b014ec02f90432d730c5c9eaf0bd1bb38f
Author: Vitalii Vorobiov <vi.vorob...@samsung.com>
Date:   Mon Mar 28 15:41:22 2016 +0300

    demo: delete previously generated object before new one
---
 src/bin/ui/live_view/elementary/live_frame.c            | 4 +---
 src/bin/ui/live_view/elementary/live_multibuttonentry.c | 4 +---
 src/bin/ui/live_view/elementary/live_notify.c           | 4 +---
 src/bin/ui/live_view/elementary/live_popup.c            | 4 +---
 src/bin/ui/live_view/elementary/live_widget_common.c    | 5 +----
 5 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/src/bin/ui/live_view/elementary/live_frame.c 
b/src/bin/ui/live_view/elementary/live_frame.c
index 82f2639..01ac974 100644
--- a/src/bin/ui/live_view/elementary/live_frame.c
+++ b/src/bin/ui/live_view/elementary/live_frame.c
@@ -34,11 +34,9 @@ _on_frame_swallow_check(void *data,
 
    EINA_LIST_FREE(frame_list, frame_obj)
      {
-        int content_type = part->swallow_content;
-
         if (part->change)
           {
-             if ((content_type == CONTENT_NONE) && (part->object))
+             if (part->object)
                {
                   content = elm_object_part_content_unset(frame_obj, 
part->name);
                   evas_object_del(content);
diff --git a/src/bin/ui/live_view/elementary/live_multibuttonentry.c 
b/src/bin/ui/live_view/elementary/live_multibuttonentry.c
index c9711eb..b63ad62 100644
--- a/src/bin/ui/live_view/elementary/live_multibuttonentry.c
+++ b/src/bin/ui/live_view/elementary/live_multibuttonentry.c
@@ -27,14 +27,12 @@ _on_multibutton_swallow_check(void *data,
    Demo_Part *part = (Demo_Part *)ei;
    Elm_Object_Item *multi_item = elm_multibuttonentry_first_item_get(data);
    Evas_Object *content;
-   int content_type = part->swallow_content;
 
    while (multi_item)
      {
         if (part->change)
           {
-             /* if NONE - delete object */
-             if ((content_type == CONTENT_NONE) && (part->object))
+             if (part->object)
                {
                   content = elm_object_part_content_unset(multi_item, 
part->name);
                   evas_object_del(content);
diff --git a/src/bin/ui/live_view/elementary/live_notify.c 
b/src/bin/ui/live_view/elementary/live_notify.c
index 8fd9702..ae8e4c2 100644
--- a/src/bin/ui/live_view/elementary/live_notify.c
+++ b/src/bin/ui/live_view/elementary/live_notify.c
@@ -27,12 +27,10 @@ _on_notify_swallow_check(void *data,
    Demo_Part *part = (Demo_Part *)ei;
    Evas_Object *object = (Evas_Object *) data;
 
-   int content_type = part->swallow_content;
-
    if (part->change)
      {
         /* if NONE - delete object */
-        if ((content_type == CONTENT_NONE) && (part->object))
+        if (part->object)
           {
              elm_box_unpack_all(object);
              evas_object_del(part->object);
diff --git a/src/bin/ui/live_view/elementary/live_popup.c 
b/src/bin/ui/live_view/elementary/live_popup.c
index e825b80..4ff8cfb 100644
--- a/src/bin/ui/live_view/elementary/live_popup.c
+++ b/src/bin/ui/live_view/elementary/live_popup.c
@@ -41,11 +41,9 @@ _on_popup_swallow_check(void *data,
    if (!strcmp(part->name, "elm.swallow.title.icon"))
      title_swallow = eina_stringshare_add("title,icon");
 
-   int content_type = part->swallow_content;
-
    if (part->change)
      {
-        if ((content_type == CONTENT_NONE) && (part->object))
+        if (part->object)
           {
              if (but_swallow)
                {
diff --git a/src/bin/ui/live_view/elementary/live_widget_common.c 
b/src/bin/ui/live_view/elementary/live_widget_common.c
index a3ca311..d6f168e 100644
--- a/src/bin/ui/live_view/elementary/live_widget_common.c
+++ b/src/bin/ui/live_view/elementary/live_widget_common.c
@@ -109,12 +109,9 @@ on_swallow_check(void *data,
    Evas_Object *object = (Evas_Object *) data;
    Evas_Object *content;
 
-   int content_type = part->swallow_content;
-
    if (part->change)
      {
-        /* if NONE - delete object */
-        if ((content_type == CONTENT_NONE) && (part->object))
+        if (part->object)
           {
              content = elm_object_part_content_unset(object, part->name);
              evas_object_del(content);

-- 


Reply via email to