From: Vitalii Vorobiov <vi.vorobiov@samsung.com>
Date: Tue, 11 Oct 2016 11:54:24 +0000 (+0300)
Subject: edje_edit: proper work with part id's on part restack and del for map fields
X-Git-Tag: accepted/tizen/common/20161019.145824~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=23ebbe051cca5b1bf9984ab542f24b14aab06f02;p=platform%2Fupstream%2Fefl.git

edje_edit: proper work with part id's on part restack and del for map fields

@fix

Change-Id: I6cb218d833047dc21ea8eb0a29e1c322bf278a9f
Signed-off-by: Vyacheslav Reutskiy <v.reutskiy@samsung.com>
---

diff --git a/src/lib/edje/edje_edit.c b/src/lib/edje/edje_edit.c
index dda2909..0482012 100644
--- a/src/lib/edje/edje_edit.c
+++ b/src/lib/edje/edje_edit.c
@@ -689,6 +689,22 @@ _edje_part_description_id_switch(int type, Edje_Part_Description_Common *c, int
         else if (t->text.id_text_source == id2)
           t->text.id_text_source = id1;
      }
+
+   if (c->map.id_persp == id1)
+     c->map.id_persp = id2;
+   else if (c->map.id_persp == id2)
+     c->map.id_persp = id1;
+
+   if (c->map.id_light == id1)
+     c->map.id_light = id2;
+   else if (c->map.id_light == id2)
+     c->map.id_light = id1;
+
+
+   if (c->map.rot.id_center == id1)
+     c->map.rot.id_center = id2;
+   else if (c->map.rot.id_center == id2)
+     c->map.rot.id_center = id1;
 }
 
 static void
@@ -3272,7 +3288,7 @@ edje_edit_part_del(Evas_Object *obj, const char *part)
    Edje_Part *ep;
    unsigned int k;
    unsigned int id;
-   unsigned short i;
+   unsigned short i, j;
 
    GET_EED_OR_RETURN(EINA_FALSE);
    GET_RP_OR_RETURN(EINA_FALSE);
@@ -3313,6 +3329,23 @@ edje_edit_part_del(Evas_Object *obj, const char *part)
              else if (i > id)
                real->part->dragable.event_id--;
           }
+
+        if (real->part->default_desc->map.id_persp == rp->part->id)
+          real->part->default_desc->map.id_persp = -1;
+        if (real->part->default_desc->map.id_light == rp->part->id)
+          real->part->default_desc->map.id_light = -1;
+        if (real->part->default_desc->map.rot.id_center == rp->part->id)
+          real->part->default_desc->map.rot.id_center = -1;
+
+        for (j = 0; j < real->part->other.desc_count; ++j)
+          {
+             if (real->part->other.desc[i]->map.id_persp == rp->part->id)
+               real->part->other.desc[i]->map.id_persp = -1;
+             if (real->part->other.desc[i]->map.id_light == rp->part->id)
+               real->part->other.desc[i]->map.id_light = -1;
+             if (real->part->other.desc[i]->map.rot.id_center == rp->part->id)
+               real->part->other.desc[i]->map.rot.id_center = -1;
+          }
      }
 
    /* Unlink all the parts and descriptions that refer to id */