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

GtkTreeView: Don't short-circuit header-height calculation

Browse Source 
The code was putting header_height at zero when there is
no model. That leads to temporary underallocation of header
buttons.
This commit is contained in:
Matthias Clasen 2011-06-09 21:40:08 -04:00
parent 1743e18c87
commit a081485269
1 changed files with 8 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
gtk/gtktreeview.c
View File

@ -2367,22 +2367,17 @@ gtk_tree_view_size_request_columns (GtkTreeView *tree_view)
tree_view->priv->header_height = 0; tree_view->priv->header_height = 0;
if (tree_view->priv->model) for (list = tree_view->priv->columns; list; list = list->next)
{ {
for (list = tree_view->priv->columns; list; list = list->next) GtkRequisition requisition;
{ GtkTreeViewColumn *column = list->data;
GtkRequisition requisition; GtkWidget *button = gtk_tree_view_column_get_button (column);
GtkTreeViewColumn *column = list->data;
GtkWidget *button = gtk_tree_view_column_get_button (column);
if (button == NULL) if (button == NULL)
continue; continue;
column = list->data; gtk_widget_get_preferred_size (button, &requisition, NULL);
tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
gtk_widget_get_preferred_size (button, &requisition, NULL);
tree_view->priv->header_height = MAX (tree_view->priv->header_height, requisition.height);
}
} }
} }