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

scrolledwindow: Fix typo in get_preferred_height calculation

Browse Source 
When we are beginning to calculate the height, if the vscrollbar_policy
is not GTK_POLICY_NEVER, and there is no min-content-height, then we
need some small non-zero value to get started. The idea is to always
ask for at least enough to fit the horizontal scrollbar.

Simply put, this should be the mirror image of the corresponding width
calculation code.

Those who got used to the buggy behaviour might notice that their
GtkScrolledWindows are not as tall as they used to be.

Fall out from 55196a705f

https://bugzilla.gnome.org/show_bug.cgi?id=766530
This commit is contained in:
Debarshi Ray
2016-05-16 21:13:14 +02:00
parent 175cf7e32d
commit df98140e8e
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
gtk/gtkscrolledwindow.c
View File

@ -1787,10 +1787,10 @@ gtk_scrolled_window_measure (GtkCssGadget *gadget,
natural_req.height = MAX (natural_req.height, priv->min_content_height);
extra_height = -1;
}
else if (policy_may_be_visible (priv->vscrollbar_policy) && !priv->use_indicators)
else if (policy_may_be_visible (priv->hscrollbar_policy) && !priv->use_indicators)
{
minimum_req.height += vscrollbar_requisition.height;
natural_req.height += vscrollbar_requisition.height;
minimum_req.height += hscrollbar_requisition.height;
natural_req.height += hscrollbar_requisition.height;
}
}
}