diff options
| -rw-r--r-- | ChangeLog | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-10 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-2 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-4 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-6 | 16 | ||||
| -rw-r--r-- | ChangeLog.pre-2-8 | 16 | ||||
| -rw-r--r-- | gtk/gtktreemodel.c | 4 | ||||
| -rw-r--r-- | gtk/gtktreemodelsort.c | 1 | ||||
| -rw-r--r-- | gtk/gtktreeview.c | 3 |
9 files changed, 103 insertions, 1 deletions
@@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index 7544e3e231..ae0bf75b9f 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/ChangeLog.pre-2-2 b/ChangeLog.pre-2-2 index 7544e3e231..ae0bf75b9f 100644 --- a/ChangeLog.pre-2-2 +++ b/ChangeLog.pre-2-2 @@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/ChangeLog.pre-2-4 b/ChangeLog.pre-2-4 index 7544e3e231..ae0bf75b9f 100644 --- a/ChangeLog.pre-2-4 +++ b/ChangeLog.pre-2-4 @@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index 7544e3e231..ae0bf75b9f 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index 7544e3e231..ae0bf75b9f 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,3 +1,19 @@ +Mon Apr 1 22:20:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): add + check for y > tree_view->priv->height (fixes #76974) + +Mon Apr 1 22:19:39 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodelsort.c (gtk_tree_model_sort_sort_level): get + the stamp changes right this time + +Mon Apr 1 22:13:24 2002 Kristian Rietveld <kris@gtk.org> + + * gtk/gtktreemodel.c (gtk_tree_row_reference_free): only + disconnect the ref callbacks when model == proxy (Thanks go to + Manuel Clos Crespo for the remote debugging) + Sat Mar 30 15:19:24 2002 Kristian Rietveld <kris@gtk.org> * gtk/gtktreemodelsort.c: revert the latest stamp increment changes, diff --git a/gtk/gtktreemodel.c b/gtk/gtktreemodel.c index 9749a4ddb2..e516b97603 100644 --- a/gtk/gtktreemodel.c +++ b/gtk/gtktreemodel.c @@ -1677,7 +1677,9 @@ gtk_tree_row_reference_free (GtkTreeRowReference *reference) if (refs->list == NULL) { - disconnect_ref_callbacks (reference->model); + if (G_OBJECT (reference->model) == reference->proxy) + disconnect_ref_callbacks (reference->model); + g_object_set_data (G_OBJECT (reference->proxy), ROW_REF_DATA_STRING, NULL); diff --git a/gtk/gtktreemodelsort.c b/gtk/gtktreemodelsort.c index 1869090759..038251d5b8 100644 --- a/gtk/gtktreemodelsort.c +++ b/gtk/gtktreemodelsort.c @@ -1512,6 +1512,7 @@ gtk_tree_model_sort_sort_level (GtkTreeModelSort *tree_model_sort, if (emit_reordered) { + gtk_tree_model_sort_increment_stamp (tree_model_sort); if (level->parent_elt) { iter.stamp = tree_model_sort->stamp; diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index fdd920dcc0..5d34033b00 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -6954,6 +6954,9 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, tree_view->priv->expander_size); y = CLAMP (y, (gint)tree_view->priv->vadjustment->lower, (gint)tree_view->priv->vadjustment->upper - vertical_separator); + if (y > tree_view->priv->height) + y = tree_view->priv->height - 1; + _gtk_rbtree_find_offset (tree_view->priv->tree, y, &cursor_tree, &cursor_node); cursor_path = _gtk_tree_view_find_path (tree_view, cursor_tree, cursor_node); g_return_if_fail (cursor_path != NULL); |