AuroraMiddleware/gtk
1
0
Fork 1
mirror of https://gitlab.gnome.org/GNOME/gtk.git synced 2024-11-19 18:00:09 +00:00
Code Issues Projects Releases Wiki Activity

Use new gtk_tree_view_column_get_desired_size()

Browse Source
This commit is contained in:
Tristan Van Berkom 2010-04-06 03:05:20 -04:00
parent 3128bd0937
commit 59dafa77dc
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
gtk/gtktreeview.c
View File

@ -2145,8 +2145,8 @@ gtk_tree_view_get_real_natural_width_from_column (GtkTreeView *tree_view,
if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE)) if (GTK_TREE_VIEW_FLAG_SET (tree_view, GTK_TREE_VIEW_HEADERS_VISIBLE))
{ {
gtk_widget_get_desired_size (column->button, gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (column->button),
NULL, &button_natural_size); NULL, &button_natural_size);
column_natural_width = MAX (column_natural_width, button_natural_size.width); column_natural_width = MAX (column_natural_width, button_natural_size.width);
} }
@ -5727,12 +5727,8 @@ validate_row (GtkTreeView *tree_view,
gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter, gtk_tree_view_column_cell_set_cell_data (column, tree_view->priv->model, iter,
GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT), GTK_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
node->children?TRUE:FALSE); node->children?TRUE:FALSE);
gtk_tree_view_column_cell_get_size (column,
NULL, NULL, NULL, gtk_tree_view_column_get_desired_size (column, &requested_size, &natural_size);
&requested_size.width,
&requested_size.height);
gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (column),
NULL, &natural_size);
if (!is_separator) if (!is_separator)
{ {