AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2025-01-15 14:50:06 +00:00
Code Issues Projects Releases Wiki Activity

rbtree: Use gtk_rbnode_adjust() more

Browse Source 
Make _gtk_rbtree_insert_before() use it.
This commit is contained in:
Benjamin Otte 2011-11-19 13:08:10 +01:00
parent 01a44e2a16
commit 7b2d414222
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
gtk/gtkrbtree.c
View File

@ -515,8 +515,6 @@ _gtk_rbtree_insert_before (GtkRBTree *tree,
{
GtkRBNode *node;
gboolean left = TRUE;
GtkRBNode *tmp_node;
GtkRBTree *tmp_tree;
#ifdef G_ENABLE_DEBUG
if (gtk_get_debug_flags () & GTK_DEBUG_TREE)
@ -546,32 +544,15 @@ _gtk_rbtree_insert_before (GtkRBTree *tree,
current->left = node;
else
current->right = node;
tmp_node = node->parent;
tmp_tree = tree;
gtk_rbnode_adjust (tree, node->parent,
1, 1, height);
}
else
{
g_assert (tree->root == tree->nil);
tree->root = node;
tmp_node = tree->parent_node;
tmp_tree = tree->parent_tree;
}
while (tmp_tree && tmp_node && tmp_node != tmp_tree->nil)
{
/* We only want to propagate the count if we are in the tree we
* started in. */
if (tmp_tree == tree)
tmp_node->count++;
tmp_node->total_count += 1;
tmp_node->offset += height;
tmp_node = tmp_node->parent;
if (tmp_node == tmp_tree->nil)
{
tmp_node = tmp_tree->parent_node;
tmp_tree = tmp_tree->parent_tree;
}
gtk_rbnode_adjust (tree->parent_tree, tree->parent_node,
0, 1, height);
}
if (valid)