forked from enlightenment/enlightenment
Tiling2: Handle more delete cases.
This commit is contained in:
parent
38e13e2648
commit
f7f204353d
|
@ -154,14 +154,11 @@ tiling_window_tree_remove(Window_Tree *root, Window_Tree *item)
|
||||||
if (!item_keep->children)
|
if (!item_keep->children)
|
||||||
{
|
{
|
||||||
parent->client = item_keep->client;
|
parent->client = item_keep->client;
|
||||||
parent->children = NULL; // FIXME: Remove this comment. item_keep->children
|
|
||||||
|
|
||||||
free(item_keep);
|
free(item_keep);
|
||||||
}
|
}
|
||||||
else if (grand_parent)
|
else if (grand_parent)
|
||||||
{
|
{
|
||||||
grand_parent->client = NULL; // FIXME: Remove this comment. item_keep->client;
|
|
||||||
|
|
||||||
/* Update the children's parent. */
|
/* Update the children's parent. */
|
||||||
{
|
{
|
||||||
Eina_Inlist *itr_safe;
|
Eina_Inlist *itr_safe;
|
||||||
|
@ -183,7 +180,10 @@ tiling_window_tree_remove(Window_Tree *root, Window_Tree *item)
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
ERR("FIXME");
|
/* FIXME: Toggle root tree direction. */
|
||||||
|
item_keep->parent = NULL;
|
||||||
|
root = item_keep;
|
||||||
|
goto end;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
|
@ -201,6 +201,7 @@ tiling_window_tree_remove(Window_Tree *root, Window_Tree *item)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
end:
|
||||||
free(item);
|
free(item);
|
||||||
return root;
|
return root;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue