AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

Fix #160281, testcase from Peter Bloomfield.

Browse Source 
2005-06-17  Kristian Rietveld  <kris@gtk.org>

	Fix #160281, testcase from Peter Bloomfield.

	* gtk/gtktreeview.c (do_presize_handler): always size request
	and update adjustments in fixed height mode,
	(gtk_tree_view_build_tree): if a fixed height is set, set this
	height on newly added nodes.
This commit is contained in:
Kristian Rietveld 2005-06-17 19:44:53 +00:00 committed by Kristian Rietveld
parent 9c8f987df7
commit 015b3c5671
4 changed files with 47 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ChangeLog
View File

@ -1,3 +1,12 @@
2005-06-17 Kristian Rietveld <kris@gtk.org>
Fix #160281, testcase from Peter Bloomfield.
* gtk/gtktreeview.c (do_presize_handler): always size request
and update adjustments in fixed height mode,
(gtk_tree_view_build_tree): if a fixed height is set, set this
height on newly added nodes.
2005-06-17 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions

9
ChangeLog.pre-2-10
View File

@ -1,3 +1,12 @@
2005-06-17 Kristian Rietveld <kris@gtk.org>
Fix #160281, testcase from Peter Bloomfield.
* gtk/gtktreeview.c (do_presize_handler): always size request
and update adjustments in fixed height mode,
(gtk_tree_view_build_tree): if a fixed height is set, set this
height on newly added nodes.
2005-06-17 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions

9
ChangeLog.pre-2-8
View File

@ -1,3 +1,12 @@
2005-06-17 Kristian Rietveld <kris@gtk.org>
Fix #160281, testcase from Peter Bloomfield.
* gtk/gtktreeview.c (do_presize_handler): always size request
and update adjustments in fixed height mode,
(gtk_tree_view_build_tree): if a fixed height is set, set this
height on newly added nodes.
2005-06-17 Tor Lillqvist <tml@novell.com>
* gdk/win32/gdkdnd-win32.c (gdk_dropfiles_filter): Set the actions

20
gtk/gtktreeview.c
View File

@ -5232,6 +5232,20 @@ do_presize_handler (GtkTreeView *tree_view)
}
validate_visible_area (tree_view);
tree_view->priv->presize_handler_timer = 0;
if (tree_view->priv->fixed_height_mode)
{
GtkRequisition requisition;
gint height_old = tree_view->priv->height;
gtk_widget_size_request (GTK_WIDGET (tree_view), &requisition);
tree_view->priv->hadjustment->upper = MAX (tree_view->priv->hadjustment->upper, (gfloat)requisition.width);
tree_view->priv->vadjustment->upper = MAX (tree_view->priv->vadjustment->upper, (gfloat)requisition.height);
gtk_adjustment_changed (tree_view->priv->hadjustment);
gtk_adjustment_changed (tree_view->priv->vadjustment);
gtk_widget_queue_resize (GTK_WIDGET (tree_view));
}
return FALSE;
}
@ -7639,6 +7653,12 @@ gtk_tree_view_build_tree (GtkTreeView *tree_view,
gtk_tree_model_ref_node (tree_view->priv->model, iter);
temp = _gtk_rbtree_insert_after (tree, temp, 0, FALSE);
if (tree_view->priv->fixed_height > 0)
{
if (GTK_RBNODE_FLAG_SET (temp, GTK_RBNODE_INVALID))
_gtk_rbtree_node_set_height (tree, temp, tree_view->priv->fixed_height);
}
if (is_list)
continue;