* Boston, MA 02111-1307, USA.
*/
+#include <config.h>
#include "gtktreemodelfilter.h"
#include "gtkintl.h"
#include "gtktreednd.h"
+#include "gtkalias.h"
+#include "gtkprivate.h"
#include <string.h>
/* ITER FORMAT:
gpointer data);
/* GtkTreeModel interface */
-static guint gtk_tree_model_filter_get_flags (GtkTreeModel *model);
+static GtkTreeModelFlags gtk_tree_model_filter_get_flags (GtkTreeModel *model);
static gint gtk_tree_model_filter_get_n_columns (GtkTreeModel *model);
static GType gtk_tree_model_filter_get_column_type (GtkTreeModel *model,
gint index);
static GtkTreePath *gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter,
GtkTreePath *child_path,
gboolean build_levels,
- gboolean fetch_childs);
+ gboolean fetch_children);
static FilterElt *gtk_tree_model_filter_fetch_child (GtkTreeModelFilter *filter,
FilterLevel *level,
static void gtk_tree_model_filter_remove_node (GtkTreeModelFilter *filter,
GtkTreeIter *iter,
gboolean emit_signal);
-static void gtk_tree_model_filter_update_childs (GtkTreeModelFilter *filter,
+static void gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter,
FilterLevel *level,
FilterElt *elt);
static FilterElt *bsearch_elt_with_offset (GArray *array,
*/
g_object_class_install_property (object_class,
PROP_CHILD_MODEL,
- g_param_spec_object ("child_model",
+ g_param_spec_object ("child-model",
("The child model"),
("The model for the filtermodel to filter"),
GTK_TYPE_TREE_MODEL,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_object_class_install_property (object_class,
PROP_VIRTUAL_ROOT,
- g_param_spec_boxed ("virtual_root",
+ g_param_spec_boxed ("virtual-root",
("The virtual root"),
("The virtual root (relative to the child model) for this filtermodel"),
GTK_TYPE_TREE_PATH,
- G_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
+ GTK_PARAM_READWRITE | G_PARAM_CONSTRUCT_ONLY));
g_type_class_add_private (object_class, sizeof (GtkTreeModelFilterPrivate));
}
g_array_insert_val (level->array, i, elt);
*index = i;
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ if (i > 0)
+ i--;
+
+ for ( ; i < level->array->len; i++)
{
FilterElt *e = &(g_array_index (level->array, FilterElt, i));
if (e->children)
{
g_array_remove_index (level->array, i);
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ i--;
+ for (i = MAX (i, 0); i < level->array->len; i++)
{
/* NOTE: here we do *not* decrease offsets, because the node was
* not removed from the child model
}
static void
-gtk_tree_model_filter_update_childs (GtkTreeModelFilter *filter,
- FilterLevel *level,
- FilterElt *elt)
+gtk_tree_model_filter_update_children (GtkTreeModelFilter *filter,
+ FilterLevel *level,
+ FilterElt *elt)
{
GtkTreeIter c_iter;
GtkTreeIter iter;
return NULL;
}
- while (start != end)
+ do
{
middle = (start + end) / 2;
else
break;
}
+ while (start != end);
if (elt->offset == offset)
{
{
GtkTreeModelFilter *filter = GTK_TREE_MODEL_FILTER (data);
GtkTreeIter iter;
- GtkTreeIter childs;
+ GtkTreeIter children;
GtkTreeIter real_c_iter;
GtkTreePath *path = NULL;
level = FILTER_LEVEL (iter.user_data);
elt = FILTER_ELT (iter.user_data2);
- /* and update the childs */
- if (gtk_tree_model_iter_children (c_model, &childs, &real_c_iter))
- gtk_tree_model_filter_update_childs (filter, level, elt);
+ /* and update the children */
+ if (gtk_tree_model_iter_children (c_model, &children, &real_c_iter))
+ gtk_tree_model_filter_update_children (filter, level, elt);
goto done;
}
}
}
+ gtk_tree_model_filter_increment_stamp (filter);
+
if (!path)
path = gtk_real_tree_model_filter_convert_child_path_to_path (filter,
c_path,
TRUE,
TRUE);
- g_return_if_fail (path != NULL);
+ if (!path)
+ /* parent is probably being filtered out */
+ goto done;
- gtk_tree_model_filter_increment_stamp (filter);
gtk_tree_model_get_iter (GTK_TREE_MODEL (filter), &iter, path);
level = FILTER_LEVEL (iter.user_data);
/* update stamp */
gtk_tree_model_row_inserted (GTK_TREE_MODEL (filter), path, &iter);
- if (gtk_tree_model_iter_children (c_model, &childs, c_iter))
- gtk_tree_model_filter_update_childs (filter, level, elt);
+ if (gtk_tree_model_iter_children (c_model, &children, c_iter))
+ gtk_tree_model_filter_update_children (filter, level, elt);
done:
if (path)
filter->priv->root_level_visible++;
}
- /* another iteration to update the references of childs to parents. */
+ /* another iteration to update the references of children to parents. */
for (i = 0; i < level->array->len; i++)
{
FilterElt *e = &g_array_index (level->array, FilterElt, i);
offset = tmp->offset;
g_array_remove_index (level->array, i);
- for (i = MAX (--i, 0); i < level->array->len; i++)
+ i--;
+ for (i = MAX (i, 0); i < level->array->len; i++)
{
elt = &g_array_index (level->array, FilterElt, i);
if (elt->offset > offset)
}
/* TreeModelIface implementation */
-static guint
+static GtkTreeModelFlags
gtk_tree_model_filter_get_flags (GtkTreeModel *model)
{
GtkTreeModelFlags flags;
if (filter->priv->child_model)
{
- g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model),
+ g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->changed_id);
- g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model),
+ g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->inserted_id);
- g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model),
+ g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->has_child_toggled_id);
- g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model),
+ g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->deleted_id);
- g_signal_handler_disconnect (G_OBJECT (filter->priv->child_model),
+ g_signal_handler_disconnect (filter->priv->child_model,
filter->priv->reordered_id);
/* reset our state */
gtk_tree_model_filter_free_level (filter, filter->priv->root);
filter->priv->root = NULL;
- g_object_unref (G_OBJECT (filter->priv->child_model));
+ g_object_unref (filter->priv->child_model);
filter->priv->visible_column = -1;
/* FIXME: destroy more crack here? the funcs? */
}
if (child_model)
{
- g_object_ref (G_OBJECT (filter->priv->child_model));
+ g_object_ref (filter->priv->child_model);
filter->priv->changed_id =
g_signal_connect (child_model, "row_changed",
G_CALLBACK (gtk_tree_model_filter_row_changed),
g_return_val_if_fail (GTK_IS_TREE_MODEL (child_model), NULL);
- retval = GTK_TREE_MODEL (g_object_new (gtk_tree_model_filter_get_type (), NULL));
-
- gtk_tree_model_filter_set_model (GTK_TREE_MODEL_FILTER (retval),
- child_model);
- gtk_tree_model_filter_set_root (GTK_TREE_MODEL_FILTER (retval), root);
+ retval = g_object_new (GTK_TYPE_TREE_MODEL_FILTER,
+ "child-model", child_model,
+ "virtual-root", root,
+ NULL);
return retval;
}
* function should return %TRUE if the given row should be visible and
* %FALSE otherwise.
*
+ * If the condition calculated by the function changes over time (e.g. because
+ * it depends on some global parameters), you must call
+ * gtk_tree_model_filter_refilter() to keep the visibility information of
+ * the model uptodate.
+ *
* Since: 2.4
*/
void
* @data: User data to pass to the modify function, or %NULL.
* @destroy: Destroy notifier of @data, or %NULL.
*
- * Sets the @filter to have @n_columns columns with @types and sets
- * @func to be the modify function of @filter.
+ * With the @n_columns and @types parameters, you give an array of column
+ * types for this model (which will be exposed to the parent model/view).
+ * The @func, @data and @destroy parameters are for specifying the modify
+ * function. The modify function will get called for <emphasis>each</emphasis>
+ * data access, the goal of the modify function is to return the data which
+ * should be displayed at the location specified using the parameters of the
+ * modify function.
*
* Since: 2.4
*/
gtk_real_tree_model_filter_convert_child_path_to_path (GtkTreeModelFilter *filter,
GtkTreePath *child_path,
gboolean build_levels,
- gboolean fetch_childs)
+ gboolean fetch_children)
{
gint *child_indices;
GtkTreePath *retval;
found_child = TRUE;
}
- if (!found_child && fetch_childs)
+ if (!found_child && fetch_children)
{
tmp = gtk_tree_model_filter_fetch_child (filter, level,
child_indices[i],
level = tmp->children;
found_child = TRUE;
}
- else if (!found_child && !fetch_childs)
+ else if (!found_child && !fetch_children)
{
/* no path */
gtk_tree_path_free (real_path);
gtk_tree_model_filter_clear_cache_helper (filter,
FILTER_LEVEL (filter->priv->root));
}
+
+#define __GTK_TREE_MODEL_FILTER_C__
+#include "gtkaliasdef.c"
projects / ~andy / gtk / blobdiff