static FilterElt *gtk_tree_model_filter_get_nth (GtkTreeModelFilter *filter,
FilterLevel *level,
int n);
+static gboolean gtk_tree_model_filter_elt_is_visible_in_target (FilterLevel *level,
+ FilterElt *elt);
static FilterElt *gtk_tree_model_filter_get_nth_visible (GtkTreeModelFilter *filter,
FilterLevel *level,
int n);
return &g_array_index (level->array, FilterElt, n);
}
+static gboolean
+gtk_tree_model_filter_elt_is_visible_in_target (FilterLevel *level,
+ FilterElt *elt)
+{
+ if (!elt->visible)
+ return FALSE;
+
+ if (!level->parent_elt)
+ return TRUE;
+
+ do
+ {
+ elt = level->parent_elt;
+ level = level->parent_level;
+
+ if (elt && !elt->visible)
+ return FALSE;
+ }
+ while (level);
+
+ return TRUE;
+}
+
static FilterElt *
gtk_tree_model_filter_get_nth_visible (GtkTreeModelFilter *filter,
FilterLevel *level,
level->visible_nodes++;
}
- if ((level->parent_elt && level->parent_elt->visible) || !level->parent_elt)
+ if (gtk_tree_model_filter_elt_is_visible_in_target (level, elt))
{
/* visibility changed -- reget path */
gtk_tree_path_free (path);