callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixup adjustments and top_row if the current dy + page_size exceeds the

Browse Source 
2006-01-14  Kristian Rietveld  <kris@gtk.org>

	* gtk/gtktreeview.c (gtk_tree_view_size_allocate),
	(validate_visible_area): fixup adjustments and top_row if the
	current dy + page_size exceeds the new tree view height. (Fixes
	#316689, reported by Chris Lord).
This commit is contained in:
Kristian Rietveld
2006-01-14 19:41:07 +00:00
committed by Kristian Rietveld
parent fcfefedd44
commit f396a237dd
3 changed files with 22 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
ChangeLog
View File

@ -1,3 +1,10 @@
2006-01-14 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate),
(validate_visible_area): fixup adjustments and top_row if the
current dy + page_size exceeds the new tree view height. (Fixes
#316689, reported by Chris Lord).
2006-01-13 Matthias Clasen <mclasen@redhat.com> 2006-01-13 Matthias Clasen <mclasen@redhat.com>
* */abicheck.sh: Make this work on more platforms. * */abicheck.sh: Make this work on more platforms.

7
ChangeLog.pre-2-10
View File

@ -1,3 +1,10 @@
2006-01-14 Kristian Rietveld <kris@gtk.org>
* gtk/gtktreeview.c (gtk_tree_view_size_allocate),
(validate_visible_area): fixup adjustments and top_row if the
current dy + page_size exceeds the new tree view height. (Fixes
#316689, reported by Chris Lord).
2006-01-13 Matthias Clasen <mclasen@redhat.com> 2006-01-13 Matthias Clasen <mclasen@redhat.com>
* */abicheck.sh: Make this work on more platforms. * */abicheck.sh: Make this work on more platforms.

8
gtk/gtktreeview.c
View File

@ -2129,6 +2129,9 @@ gtk_tree_view_size_allocate (GtkWidget *widget,
/* now the adjustments and window sizes are in sync, we can sync toprow/dy again */ /* now the adjustments and window sizes are in sync, we can sync toprow/dy again */
if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size) if (tree_view->priv->height <= tree_view->priv->vadjustment->page_size)
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment),
tree_view->priv->height - tree_view->priv->vadjustment->page_size);
else if (gtk_tree_row_reference_valid (tree_view->priv->top_row)) else if (gtk_tree_row_reference_valid (tree_view->priv->top_row))
gtk_tree_view_top_row_to_dy (tree_view); gtk_tree_view_top_row_to_dy (tree_view);
else else
@ -5067,6 +5070,11 @@ validate_visible_area (GtkTreeView *tree_view)
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0); gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), 0);
gtk_tree_view_dy_to_top_row (tree_view); gtk_tree_view_dy_to_top_row (tree_view);
} }
else if (tree_view->priv->vadjustment->value + tree_view->priv->vadjustment->page_size > tree_view->priv->height)
{
gtk_adjustment_set_value (GTK_ADJUSTMENT (tree_view->priv->vadjustment), tree_view->priv->height - tree_view->priv->vadjustment->page_size);
gtk_tree_view_dy_to_top_row (tree_view);
}
else else
gtk_tree_view_top_row_to_dy (tree_view); gtk_tree_view_top_row_to_dy (tree_view);