mirror of
https://gitlab.gnome.org/GNOME/gtk.git
synced 2024-09-30 19:17:34 +00:00
Merge branch 'master' into treeview-refactor
This commit is contained in:
commit
0d7fdfb36e
@ -220,14 +220,15 @@ compute_size_for_orientation (GtkWidget *request,
|
|||||||
/* Unconditional size request runs but is often unhandled. */
|
/* Unconditional size request runs but is often unhandled. */
|
||||||
do_size_request (widget, &requisition);
|
do_size_request (widget, &requisition);
|
||||||
|
|
||||||
push_recursion_check (request, orientation, for_size);
|
|
||||||
if (orientation == GTK_SIZE_GROUP_HORIZONTAL)
|
if (orientation == GTK_SIZE_GROUP_HORIZONTAL)
|
||||||
{
|
{
|
||||||
requisition_size = requisition.width;
|
requisition_size = requisition.width;
|
||||||
|
|
||||||
if (for_size < 0)
|
if (for_size < 0)
|
||||||
{
|
{
|
||||||
|
push_recursion_check (request, orientation, for_size);
|
||||||
GTK_WIDGET_GET_CLASS (request)->get_preferred_width (request, &min_size, &nat_size);
|
GTK_WIDGET_GET_CLASS (request)->get_preferred_width (request, &min_size, &nat_size);
|
||||||
|
pop_recursion_check (request, orientation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -245,8 +246,10 @@ compute_size_for_orientation (GtkWidget *request,
|
|||||||
&ignored_position,
|
&ignored_position,
|
||||||
&for_size);
|
&for_size);
|
||||||
|
|
||||||
|
push_recursion_check (request, orientation, for_size);
|
||||||
GTK_WIDGET_GET_CLASS (request)->get_preferred_width_for_height (request, for_size,
|
GTK_WIDGET_GET_CLASS (request)->get_preferred_width_for_height (request, for_size,
|
||||||
&min_size, &nat_size);
|
&min_size, &nat_size);
|
||||||
|
pop_recursion_check (request, orientation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
@ -255,7 +258,9 @@ compute_size_for_orientation (GtkWidget *request,
|
|||||||
|
|
||||||
if (for_size < 0)
|
if (for_size < 0)
|
||||||
{
|
{
|
||||||
|
push_recursion_check (request, orientation, for_size);
|
||||||
GTK_WIDGET_GET_CLASS (request)->get_preferred_height (request, &min_size, &nat_size);
|
GTK_WIDGET_GET_CLASS (request)->get_preferred_height (request, &min_size, &nat_size);
|
||||||
|
pop_recursion_check (request, orientation);
|
||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
@ -273,11 +278,12 @@ compute_size_for_orientation (GtkWidget *request,
|
|||||||
&ignored_position,
|
&ignored_position,
|
||||||
&for_size);
|
&for_size);
|
||||||
|
|
||||||
|
push_recursion_check (request, orientation, for_size);
|
||||||
GTK_WIDGET_GET_CLASS (request)->get_preferred_height_for_width (request, for_size,
|
GTK_WIDGET_GET_CLASS (request)->get_preferred_height_for_width (request, for_size,
|
||||||
&min_size, &nat_size);
|
&min_size, &nat_size);
|
||||||
|
pop_recursion_check (request, orientation);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
pop_recursion_check (request, orientation);
|
|
||||||
|
|
||||||
if (min_size > nat_size)
|
if (min_size > nat_size)
|
||||||
{
|
{
|
||||||
|
@ -1335,6 +1335,9 @@ gtk_tree_view_init (GtkTreeView *tree_view)
|
|||||||
|
|
||||||
tree_view->priv->event_last_x = -10000;
|
tree_view->priv->event_last_x = -10000;
|
||||||
tree_view->priv->event_last_y = -10000;
|
tree_view->priv->event_last_y = -10000;
|
||||||
|
|
||||||
|
gtk_tree_view_set_vadjustment (tree_view, NULL);
|
||||||
|
gtk_tree_view_set_hadjustment (tree_view, NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user