callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Massive reordering/sorting work. Now pretty much works.

Browse Source 
Thu Mar 29 16:29:12 2001  Jonathan Blandford  <jrb@webwynk.net>

	* gtk/gtkliststore.c (gtk_list_store_iter_changed): Massive
	reordering/sorting work.  Now pretty much works.

	* gtk/gtkrbtree.c (_gtk_rbtree_reorder): Lots of work to make
	reorder mostly work.  Still need to get the parity correct.

	* gtk/gtktreeviewcolumn.c: Listen for "model" property changed
	signal, so I can listen for the sort_column_changed signal so I
	can change my "sort_indicator" property.  Cool.
This commit is contained in:
Jonathan Blandford
2001-03-29 21:30:05 +00:00
committed by Jonathan Blandford
parent c61a8f282f
commit f19af6f49c
15 changed files with 338 additions and 99 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
gtk/gtkrbtree.c
View File

@ -720,6 +720,7 @@ typedef struct _GtkRBReorder
gint height;
gint flags;
gint order;
gint invert_order;
} GtkRBReorder;
static int
@ -729,6 +730,13 @@ gtk_rbtree_reorder_sort_func (gconstpointer a,
return ((GtkRBReorder *) a)->order > ((GtkRBReorder *) b)->order;
}
static int
gtk_rbtree_reorder_invert_func (gconstpointer a,
gconstpointer b)
{
return ((GtkRBReorder *) a)->invert_order > ((GtkRBReorder *) b)->invert_order;
}
static void
gtk_rbtree_reorder_fixup (GtkRBTree *tree,
GtkRBNode *node)
@ -768,26 +776,35 @@ _gtk_rbtree_reorder (GtkRBTree *tree,
GtkRBNode *node;
gint i;
node = tree->root;
while (node && node->left != tree->nil)
node = node->left;
/* Sort the trees values in the new tree. */
array = g_array_sized_new (FALSE, FALSE, sizeof (GtkRBReorder), length);
for (i = 0; i < length; i++)
{
g_assert (node != tree->nil);
reorder.children = node->children;
reorder.flags = GTK_RBNODE_NON_COLORS & node->flags;
reorder.height = GTK_RBNODE_GET_HEIGHT (node);
reorder.order = new_order[i];
reorder.invert_order = i;
g_array_append_val (array, reorder);
}
g_array_sort(array, gtk_rbtree_reorder_sort_func);
/* rewind node*/
node = tree->root;
while (node && node->left != tree->nil)
node = node->left;
for (i = 0; i < length; i++)
{
g_assert (node != tree->nil);
g_array_index (array, GtkRBReorder, i).children = node->children;
g_array_index (array, GtkRBReorder, i).flags = GTK_RBNODE_NON_COLORS & node->flags;
g_array_index (array, GtkRBReorder, i).height = GTK_RBNODE_GET_HEIGHT (node);
node = _gtk_rbtree_next (tree, node);
}
g_array_sort (array, gtk_rbtree_reorder_sort_func);
g_array_sort (array, gtk_rbtree_reorder_invert_func);
/* rewind node*/
node = tree->root;
while (node && node->left != tree->nil)
@ -797,14 +814,12 @@ _gtk_rbtree_reorder (GtkRBTree *tree,
for (i = 0; i < length; i++)
{
reorder = g_array_index (array, GtkRBReorder, i);
node->children = reorder.children;
node->flags = GTK_RBNODE_GET_COLOR (node) | reorder.flags;
/* We temporarily set the height to this. */
node->offset = reorder.height;
node = _gtk_rbtree_next (tree, node);
}
gtk_rbtree_reorder_fixup (tree, tree->root);
}