mirrors/netsurf
1
0
Fork 0
mirror of https://github.com/netsurf-browser/netsurf synced 2025-01-12 22:09:19 +03:00
Code Issues Packages Projects Releases Wiki Activity

Implement DEL_EMPTY_DIRS flag.

Browse Source
This commit is contained in:
Michael Drake 2013-07-03 12:37:58 +01:00
parent 520503bc7e
commit 657d6ed587
1 changed files with 20 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
desktop/treeview.c
View File

@ -485,15 +485,18 @@ static nserror treeview_delete_node_internal(struct treeview *tree,
struct treeview_node_msg msg;
msg.msg = TREE_MSG_NODE_DELETE;
struct treeview_node *p;
static int nest_depth = 0;
if (interaction && (tree->flags & TREEVIEW_NO_DELETES)) {
return NSERROR_OK;
}
/* Destroy children first */
nest_depth++;
while (n->children != NULL) {
treeview_delete_node_internal(tree, n->children, interaction);
}
nest_depth--;
/* Unlink node from tree */
if (n->parent != NULL && n->parent->children == n) {
@ -531,8 +534,23 @@ static nserror treeview_delete_node_internal(struct treeview *tree,
return NSERROR_BAD_PARAMETER;
}
/* Inform front end of change in dimensions */
tree->cw_t->update_size(tree->cw_h, -1, tree->root->height);
if (nest_depth == 0) {
/* This is the node we were originally asked to delete */
if (tree->flags & TREEVIEW_DEL_EMPTY_DIRS &&
n->parent != NULL &&
n->parent->type != TREE_NODE_ROOT &&
n->parent->children == NULL) {
/* Delete empty parent */
nest_depth++;
treeview_delete_node_internal(tree, n->parent,
interaction);
nest_depth--;
}
/* Inform front end of change in dimensions */
tree->cw_t->update_size(tree->cw_h, -1, tree->root->height);
}
/* Free the node */
free(n);