diff options
| author | Jonathan Blandford <jrb@redhat.com> | 2001-11-01 20:46:01 +0000 |
|---|---|---|
| committer | Jonathan Blandford <jrb@src.gnome.org> | 2001-11-01 20:46:01 +0000 |
| commit | 2704ea2b581c4d601c43e9843fca9afe271fc3a7 (patch) | |
| tree | 7fdf222c644ba96d2b24367eab16f8ed161ecb1b /gtk/gtktreemodelsort.c | |
| parent | b852358d0ac7e144909236fa5851ec89408b9867 (diff) | |
| download | gdk-pixbuf-2704ea2b581c4d601c43e9843fca9afe271fc3a7.tar.gz | |
it's amazing how well things work sometimes, even when they're completely
Thu Nov 1 15:45:04 2001 Jonathan Blandford <jrb@redhat.com>
* gtk/gtktreemodelsort.c (gtk_tree_model_sort_rows_reordered):
it's amazing how well things work sometimes, even when they're
completely wrong.
* gtk/gtktreeview.c (gtk_tree_view_real_collapse_row): Fix bug
where you could try to collapse a node w/o it having children.
(gtk_tree_view_class_init): remove Shift L<->R as they already
existed for expand/collapse.
Diffstat (limited to 'gtk/gtktreemodelsort.c')
| -rw-r--r-- | gtk/gtktreemodelsort.c | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 6fe97993d..565b15100 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -676,7 +676,7 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model, SortLevel *level; GtkTreeIter iter; gint *tmp_array; - int i; + int i, j; GtkTreePath *path; GtkTreeModelSort *tree_model_sort = GTK_TREE_MODEL_SORT (data); @@ -716,11 +716,18 @@ gtk_tree_model_sort_rows_reordered (GtkTreeModel *s_model, tmp_array = g_new (int, level->array->len); for (i = 0; i < level->array->len; i++) - tmp_array[new_order[i]] = g_array_index (level->array, SortElt, i).offset; + { + for (j = 0; j < level->array->len; j++) + { + if (g_array_index (level->array, SortElt, i).offset == new_order[j]) + tmp_array[i] = j; + } + } + for (i = 0; i < level->array->len; i++) g_array_index (level->array, SortElt, i).offset = tmp_array[i]; g_free (tmp_array); - + if (tree_model_sort->sort_column_id == -1 && tree_model_sort->default_sort_func == (GtkTreeIterCompareFunc) 0x1) { |