[gtk+/native-layout] Use new gtk_tree_view_column_get_desired_size()
- From: Tristan Van Berkom <tvb src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gtk+/native-layout] Use new gtk_tree_view_column_get_desired_size()
- Date: Tue, 6 Apr 2010 07:09:06 +0000 (UTC)
commit 59dafa77dcf8b16cc9fac41e21d307ba98aca6e2
Author: Tristan Van Berkom <tristan van berkom gmail com>
Date: Tue Apr 6 03:05:20 2010 -0400
Use new gtk_tree_view_column_get_desired_size()
gtk/gtktreeview.c | 12 ++++--------
1 files changed, 4 insertions(+), 8 deletions(-)
---
diff --git a/gtk/gtktreeview.c b/gtk/gtktreeview.c
index f680f62..7343d67 100644
--- a/gtk/gtktreeview.c
+++ b/gtk/gtktreeview.c
@@ -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))
{
- gtk_widget_get_desired_size (column->button,
- NULL, &button_natural_size);
+ gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (column->button),
+ NULL, &button_natural_size);
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_RBNODE_FLAG_SET (node, GTK_RBNODE_IS_PARENT),
node->children?TRUE:FALSE);
- gtk_tree_view_column_cell_get_size (column,
- NULL, NULL, NULL,
- &requested_size.width,
- &requested_size.height);
- gtk_extended_layout_get_desired_size (GTK_EXTENDED_LAYOUT (column),
- NULL, &natural_size);
+
+ gtk_tree_view_column_get_desired_size (column, &requested_size, &natural_size);
if (!is_separator)
{
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]