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

Add temporary hack to get the row heights right

Browse Source
This commit is contained in:
Kristian Rietveld 2010-11-28 21:02:36 +01:00
parent 6568b59e8a
commit cbbff6c5e6
1 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtktreeviewcolumn.c
View File

@ -2472,6 +2472,8 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
gint *width,
gint *height)
{
int focus_line_width;
g_return_if_fail (GTK_IS_TREE_VIEW_COLUMN (tree_column));
if (height)
@ -2479,6 +2481,18 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
if (width)
* width = 0;
/* FIXME: This is a temporary hack to get things to allocate mostly right.
*
* We will add twice the focus-line-width to the for-width
* parameter below. If we do not do this, the height returned is the
* height for two lines of text instead of one. It feels like some lines
* get less width than expected (due to subtraction of focus_line_width?)
* and will unnecessarily wrap.
*/
gtk_widget_style_get (tree_column->tree_view,
"focus-line-width", &focus_line_width,
NULL);
gtk_cell_area_context_sum_preferred_width (tree_column->cell_area_context);
gtk_cell_area_get_preferred_width (tree_column->cell_area,
@ -2488,7 +2502,7 @@ gtk_tree_view_column_cell_get_size (GtkTreeViewColumn *tree_column,
gtk_cell_area_get_preferred_height_for_width (tree_column->cell_area,
tree_column->cell_area_context,
tree_column->tree_view,
*width,
*width + focus_line_width * 2,
height,
NULL);