summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Drake <tlsa@netsurf-browser.org>2013-09-03 12:36:29 +0100
committerMichael Drake <tlsa@netsurf-browser.org>2013-09-03 12:36:29 +0100
commit11b784a16772bc396ccca60acac6402f88a82ca7 (patch)
tree0fbdc23ae766b5976f9c2f813cc9d51d10e23293
parentc2375339a1556d687ce0ccc8bec633a8737f585e (diff)
downloadnetsurf-11b784a16772bc396ccca60acac6402f88a82ca7.tar.gz
netsurf-11b784a16772bc396ccca60acac6402f88a82ca7.tar.bz2
Node collapsing needs to happen when leaving nodes.
-rw-r--r--desktop/treeview.c15
1 files changed, 7 insertions, 8 deletions
diff --git a/desktop/treeview.c b/desktop/treeview.c
index 58e199b20..0f011b373 100644
--- a/desktop/treeview.c
+++ b/desktop/treeview.c
@@ -1424,8 +1424,7 @@ nserror treeview_node_expand(treeview *tree, treeview_node *node)
/** Treewalk node callback for handling node contraction. */
-static nserror treeview_node_contract_cb(treeview_node *n, void *ctx,
- bool *skip_children, bool *end)
+static nserror treeview_node_contract_cb(treeview_node *n, void *ctx, bool *end)
{
int h_reduction;
@@ -1466,11 +1465,11 @@ nserror treeview_node_contract(treeview *tree, treeview_node *node)
selected = node->flags & TREE_NODE_SELECTED;
/* Contract children. */
- treeview_walk_internal(node, false, NULL,
- treeview_node_contract_cb, NULL);
+ treeview_walk_internal(node, false, treeview_node_contract_cb,
+ NULL, NULL);
/* Contract node */
- treeview_node_contract_cb(node, NULL, false, false);
+ treeview_node_contract_cb(node, NULL, false);
if (selected)
node->flags |= TREE_NODE_SELECTED;
@@ -1500,11 +1499,11 @@ nserror treeview_contract(treeview *tree, bool all)
selected = n->flags & TREE_NODE_SELECTED;
/* Contract children. */
- treeview_walk_internal(n, false, NULL,
- treeview_node_contract_cb, NULL);
+ treeview_walk_internal(n, false,
+ treeview_node_contract_cb, NULL, NULL);
/* Contract node */
- treeview_node_contract_cb(n, NULL, false, false);
+ treeview_node_contract_cb(n, NULL, false);
if (selected)
n->flags |= TREE_NODE_SELECTED;