From 1629735020cc6d89ad077736398cc66a5cc3b4d4 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Fri, 6 Aug 2004 17:38:51 +0000 Subject: [PATCH] Fix an off-by-one error. (#141809, Markku Vire) * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): Fix an off-by-one error. (#141809, Markku Vire) --- ChangeLog | 3 +++ ChangeLog.pre-2-10 | 3 +++ ChangeLog.pre-2-6 | 3 +++ ChangeLog.pre-2-8 | 3 +++ gtk/gtktreeview.c | 2 +- 5 files changed, 13 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f936570bbe..51fc3690ba 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,8 @@ 2004-08-06 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): Fix + an off-by-one error. (#141809, Markku Vire) + * gtk/gtkdnd.c (gtk_drag_dest_set, gtk_drag_source_set): Really fix the initialization of the target list. diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10 index f936570bbe..51fc3690ba 100644 --- a/ChangeLog.pre-2-10 +++ b/ChangeLog.pre-2-10 @@ -1,5 +1,8 @@ 2004-08-06 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): Fix + an off-by-one error. (#141809, Markku Vire) + * gtk/gtkdnd.c (gtk_drag_dest_set, gtk_drag_source_set): Really fix the initialization of the target list. diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6 index f936570bbe..51fc3690ba 100644 --- a/ChangeLog.pre-2-6 +++ b/ChangeLog.pre-2-6 @@ -1,5 +1,8 @@ 2004-08-06 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): Fix + an off-by-one error. (#141809, Markku Vire) + * gtk/gtkdnd.c (gtk_drag_dest_set, gtk_drag_source_set): Really fix the initialization of the target list. diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8 index f936570bbe..51fc3690ba 100644 --- a/ChangeLog.pre-2-8 +++ b/ChangeLog.pre-2-8 @@ -1,5 +1,8 @@ 2004-08-06 Matthias Clasen + * gtk/gtktreeview.c (gtk_tree_view_move_cursor_page_up_down): Fix + an off-by-one error. (#141809, Markku Vire) + * gtk/gtkdnd.c (gtk_drag_dest_set, gtk_drag_source_set): Really fix the initialization of the target list. diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c index 5b068571d0..b73f244b5f 100644 --- a/gtk/gtktreeview.c +++ b/gtk/gtktreeview.c @@ -8420,7 +8420,7 @@ gtk_tree_view_move_cursor_page_up_down (GtkTreeView *tree_view, y += ROW_HEIGHT (tree_view, GTK_RBNODE_GET_HEIGHT (cursor_node)); y = CLAMP (y, (gint)tree_view->priv->vadjustment->lower, (gint)tree_view->priv->vadjustment->upper - vertical_separator); - if (y > tree_view->priv->height) + 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);