[EGIT] [tools/eflete] master 09/78: editor: fix deletion of last part

[Andrii Kroitor]

rimmed pushed a commit to branch master.

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

commit 4334cac5541434d66ee4080edd1b46f46ac276e6
Author: Andrii Kroitor <an.kroi...@samsung.com>
Date:   Tue Dec 15 17:34:06 2015 +0200

    editor: fix deletion of last part
---
 src/bin/editor/editor_part.c | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/src/bin/editor/editor_part.c b/src/bin/editor/editor_part.c
index b868cdf..17dcadd 100644
--- a/src/bin/editor/editor_part.c
+++ b/src/bin/editor/editor_part.c
@@ -697,9 +697,9 @@ editor_part_restack(Evas_Object *edit_object, Change 
*change, Eina_Bool merge,
    assert(edit_object != NULL);
    assert(part_name != NULL);
 
+   old_relative_part = edje_edit_part_above_get(edit_object, part_name);
    if (change)
      {
-        old_relative_part = edje_edit_part_above_get(edit_object, part_name);
         diff = mem_calloc(1, sizeof(Diff));
         diff->redo.type = FUNCTION_TYPE_STRING_STRING;
         diff->redo.function = editor_part_restack;
@@ -721,8 +721,11 @@ editor_part_restack(Evas_Object *edit_object, Change 
*change, Eina_Bool merge,
      }
    else
      {
-        if (!edje_edit_part_restack_above(edit_object, part_name))
-          return false;
+        /* edje_edit don't allows to restack_above part that is already on top,
+           but it is needed to simplify adding part deletion to history */
+        if (old_relative_part != NULL)
+          if (!edje_edit_part_restack_above(edit_object, part_name))
+            return false;
      }
 
    _editor_project_changed();

--