callisto-debian/gtk3
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "scrolledwindow: Better size requisition for GTK_SCROLL_NATURAL children"

Browse Source 
This reverts commit 096bea3f0e.

This was accidentally pushed.
This commit is contained in:
Matthias Clasen 2016-05-18 07:48:26 -04:00
parent 1d04bdf845
commit f516faaef8
1 changed files with 1 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gtk/gtkscrolledwindow.c
View File

@ -1711,8 +1711,6 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget); GtkScrolledWindow *scrolled_window = GTK_SCROLLED_WINDOW (widget);
GtkScrolledWindowPrivate *priv = scrolled_window->priv; GtkScrolledWindowPrivate *priv = scrolled_window->priv;
GtkBin *bin = GTK_BIN (scrolled_window); GtkBin *bin = GTK_BIN (scrolled_window);
GtkScrollablePolicy scrollable_hpolicy = GTK_SCROLL_MINIMUM;
GtkScrollablePolicy scrollable_vpolicy = GTK_SCROLL_MINIMUM;
gint extra_width; gint extra_width;
gint extra_height; gint extra_height;
gint scrollbar_spacing; gint scrollbar_spacing;
@ -1740,11 +1738,7 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
child = gtk_bin_get_child (bin); child = gtk_bin_get_child (bin);
if (GTK_IS_SCROLLABLE (child)) if (GTK_IS_SCROLLABLE (child))
{
gtk_scrollable_get_border (GTK_SCROLLABLE (child), &border); gtk_scrollable_get_border (GTK_SCROLLABLE (child), &border);
scrollable_hpolicy = gtk_scrollable_get_hscroll_policy (GTK_SCROLLABLE (child));
scrollable_vpolicy = gtk_scrollable_get_vscroll_policy (GTK_SCROLLABLE (child));
}
if (child && gtk_widget_get_visible (child)) if (child && gtk_widget_get_visible (child))
{ {
@ -1767,11 +1761,6 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
natural_req.width += priv->min_content_width; natural_req.width += priv->min_content_width;
extra_width = -1; extra_width = -1;
} }
else if (scrollable_hpolicy == GTK_SCROLL_NATURAL)
{
minimum_req.width += min_child_size;
natural_req.width += nat_child_size;
}
else if (policy_may_be_visible (priv->vscrollbar_policy) && !priv->use_indicators) else if (policy_may_be_visible (priv->vscrollbar_policy) && !priv->use_indicators)
{ {
minimum_req.width += vscrollbar_requisition.width; minimum_req.width += vscrollbar_requisition.width;
@ -1798,11 +1787,6 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
natural_req.height += priv->min_content_height; natural_req.height += priv->min_content_height;
extra_height = -1; extra_height = -1;
} }
else if (scrollable_vpolicy == GTK_SCROLL_NATURAL)
{
minimum_req.height += min_child_size;
natural_req.height += nat_child_size;
}
else if (policy_may_be_visible (priv->hscrollbar_policy) && !priv->use_indicators) else if (policy_may_be_visible (priv->hscrollbar_policy) && !priv->use_indicators)
{ {
minimum_req.height += hscrollbar_requisition.height; minimum_req.height += hscrollbar_requisition.height;