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

More or less revert 91949934 which broke the regression test for bug #111500.

Browse Source 
https://bugzilla.gnome.org/show_bug.cgi?id=691842
This commit is contained in:
John Lindgren 2013-01-16 21:36:45 -05:00 committed by Benjamin Otte
parent f8f5ba3353
commit bb10561450
1 changed files with 32 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
gtk/gtktreeview.c
View File

@ -6501,6 +6501,8 @@ initialize_fixed_height_mode (GtkTreeView *tree_view)
static gboolean static gboolean
do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize) do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
{ {
static gboolean prevent_recursion_hack = FALSE;
GtkRBTree *tree = NULL; GtkRBTree *tree = NULL;
GtkRBNode *node = NULL; GtkRBNode *node = NULL;
gboolean validated_area = FALSE; gboolean validated_area = FALSE;
@ -6516,6 +6518,10 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
g_assert (tree_view); g_assert (tree_view);
/* prevent infinite recursion via get_preferred_width() */
if (prevent_recursion_hack)
return FALSE;
if (tree_view->priv->tree == NULL) if (tree_view->priv->tree == NULL)
return FALSE; return FALSE;
@ -6630,12 +6636,38 @@ do_validate_rows (GtkTreeView *tree_view, gboolean queue_resize)
done: done:
if (validated_area) if (validated_area)
{ {
GtkRequisition requisition;
/* We temporarily guess a size, under the assumption that it will be the
* same when we get our next size_allocate. If we don't do this, we'll be
* in an inconsistent state when we call top_row_to_dy. */
/* FIXME: This is called from size_request, for some reason it is not infinitely
* recursing, we cannot call gtk_widget_get_preferred_size() here because that's
* not allowed (from inside ->get_preferred_width/height() implementations, one
* should call the vfuncs directly). However what is desired here is the full
* size including any margins and limited by any alignment (i.e. after
* GtkWidget:adjust_size_request() is called).
*
* Currently bypassing this but the real solution is to not update the scroll adjustments
* untill we've recieved an allocation (never update scroll adjustments from size-requests).
*/
prevent_recursion_hack = TRUE;
gtk_tree_view_get_preferred_width (GTK_WIDGET (tree_view), &requisition.width, NULL);
gtk_tree_view_get_preferred_height (GTK_WIDGET (tree_view), &requisition.height, NULL);
prevent_recursion_hack = FALSE;
/* If rows above the current position have changed height, this has /* If rows above the current position have changed height, this has
* affected the current view and thus needs a redraw. * affected the current view and thus needs a redraw.
*/ */
if (y != -1 && y < gtk_adjustment_get_value (tree_view->priv->vadjustment)) if (y != -1 && y < gtk_adjustment_get_value (tree_view->priv->vadjustment))
gtk_widget_queue_draw (GTK_WIDGET (tree_view)); gtk_widget_queue_draw (GTK_WIDGET (tree_view));
gtk_adjustment_set_upper (tree_view->priv->hadjustment,
MAX (gtk_adjustment_get_upper (tree_view->priv->hadjustment), requisition.width));
gtk_adjustment_set_upper (tree_view->priv->vadjustment,
MAX (gtk_adjustment_get_upper (tree_view->priv->vadjustment), requisition.height));
if (queue_resize) if (queue_resize)
gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view)); gtk_widget_queue_resize_no_redraw (GTK_WIDGET (tree_view));
} }